Merge a72fc1c02e into 021b118c5c

app/assets/javascripts/application.js

@@ -9,9 +9,7 @@
 //
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery.ui.all
+
 //= require jquery_ujs
 //= require jquery-fileupload
 //= require jquery-ui-timepicker-addon

app/views/layouts/application.html.haml

@@ -5,9 +5,11 @@
     %title= content_for?(:title) ? yield(:title) : "OSEM"
     %meta{:content => "", :name => "description"}
     %meta{:content => "", :name => "author"}
+    = jquery_include_tag :google
+    = jquery_ui_include_tag :google
+    = javascript_include_tag "application"
     = stylesheet_link_tag "application", :media => "all"
     = stylesheet_link_tag "splash" if content_for :splash
-    = javascript_include_tag "application"
     = csrf_meta_tags
     :javascript
       $(function() {