diff --git a/Gemfile.lock b/Gemfile.lock
index 878fda6..9073631 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,14 +105,11 @@ GEM
     multipart-post (1.2.0)
     mysql2 (0.3.13)
     net-ldap (0.2.2)
-<<<<<<< HEAD
     nokogiri (1.5.6)
-=======
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     nokogiri (1.6.0-x86-mingw32)
       mini_portile (~> 0.5.0)
->>>>>>> d314a8126862e76d94c84a289a8883167b58a001
     oauth2 (0.8.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index cc45c82..f7b116d 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -12,7 +12,7 @@
       <b><%= studium.typ%> </b>
     </p>
     <p><b><%=I18n.t("studien.desc")%>:</b><br>
-      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%>
+      <%= !(studium.desc.to_s == "") ? studium.desc_first_words.html_safe :  I18n.t("keine.beschreibung")%>
     </p>
     
   </div>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 9b78f5d..874a4c7 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -9,7 +9,13 @@
     </div>
   </div>
   <div class="row-fluid">
+    <% if params[:info]==true %>
     <%= raw(@studium.desc) %>
+    <% else %>
+    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+    <% end %>
+
+
     <% @studienphasen.each do |sp| %>
       <% sp[:modulgruppen].each do |row| %>
 	<div class="row-fluid">