Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -164,6 +164,9 @@
 					</div>
 					<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
 					<div class="widget-content">
+					
+					<div id='bulletin_links' class="bulletin_links_block">
+					
 					<table class="table table-condensed">
 						<thead>
 							<tr>
@@ -186,8 +189,6 @@
 							</tr>
 						</tfoot>
 						<tbody>
-							
-							<div id='bulletin_links' class="bulletin_links_block">
 						
 							<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
 								<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
@@ -195,11 +196,13 @@
 									<%= render :partial => 'form_bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
 								<% end %>
 							<% end %>	
-								
-							</div>
 							
 						</tbody>
 					</table>
+					
+								
+					</div>
+							
 					</div>
 				</div>
 			</div>	
@@ -212,6 +215,9 @@
 					</div>
 					<h3 class="widget-title"><i class="icons-paperclip icons-white"></i>File</h3>
 					<div class="widget-content">
+						
+					<div id='bulletin_files' class="bulletin_files_block">
+							
 					<table class="table table-condensed">
 						<thead>
 							<tr>
@@ -232,8 +238,6 @@
 							</tr>
 						</tfoot>
 						<tbody>
-						
-							<div id='bulletin_files' class="bulletin_files_block">
 							
 								<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
 									<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
@@ -241,11 +245,12 @@
 										<%= render :partial => 'form_bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
 									<% end %>
 								<% end %>	
-								
-							</div>
 							
 						</tbody>
 					</table>
+								
+					</div>
+					
 					</div>
 				</div>
 			</div>