Merge remote-tracking branch 'origin/desktop_work' into desktop

* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb

@@ -15,7 +15,7 @@
 <div id="co_author_relation_table" class="tinycanvas vp">
   <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
   <div class="viewport">
-    <div class="overview" content-layout="datalist" per-column="5" base-width="300">
+    <div class="overview" content-layout="datalist" per-column="4" base-width="300">
       <%= render :partial => 'show_form'%>
     </div>
   </div>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb

@@ -10,7 +10,6 @@
     <div class="overview" content-layout="datalist" per-column="4" base-width="300">
       <ul>
       <% @journal_co_authors.each_with_index do |co_author,i| %>
-
             <li class="list_t_item" item="true">
               <ul class="info">
                 <li><div class="name"><%= co_author.co_author %></div></li>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

@@ -224,6 +224,7 @@
         </div>
       </div>
     </div>
+    </div>
   </div>
 </div>