Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/themen/_form.html.erb

Gemfile.lock

@@ -123,6 +123,7 @@ GEM
     httpclient (2.4.0)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-datetimepicker-rails (2.2.5.0)
     jquery-fileupload-rails (0.4.1)
       actionpack (>= 3.1)
       railties (>= 3.1)
@@ -248,7 +249,7 @@ GEM
       ref
     thor (0.18.1)
     tilt (1.4.1)
-    tinymce-rails (3.5.8)
+    tinymce-rails (4.1.0)
       railties (>= 3.1.1)
     treetop (1.4.15)
       polyglot
@@ -289,6 +290,7 @@ DEPENDENCIES
   globalize-versioning
   gollum-lib
   haml
+  jquery-datetimepicker-rails
   jquery-fileupload-rails
   jquery-rails
   jquery-ui-rails (~> 4.1.1)
@@ -310,7 +312,7 @@ DEPENDENCIES
   sqlite3
   themes_for_rails
   therubyracer
-  tinymce-rails (~> 3.5.8)
+  tinymce-rails (~> 4.1.0)
   uglifier (>= 1.0.3)
   webrick (= 1.3.1)
   wikicloth