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

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb

@@ -2,9 +2,14 @@
 	<%= stylesheet_link_tag "inc/permission-checkbox"  %>
 <% end %>
 <% content_for :page_specific_javascript do %>
+<<<<<<< HEAD
 	<%= javascript_include_tag "bootstrap"  %>
 	<%#= javascript_include_tag "inc/permission-checkbox"  %>
 	<%#= javascript_include_tag "inc/search"  %>
+=======
+	<%= javascript_include_tag "inc/permission-checkbox"  %>
+	<%= javascript_include_tag "inc/search"  %>
+>>>>>>> 291d5e3a03ba7da62ceb5e3b18012f0c9198dfba
 <% end %>
 <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
 <%= form_tag('', :remote => true)  %>