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

Conflicts:
	app/views/layouts/application.html.erb

app/assets/javascripts/application.js

@@ -23,11 +23,10 @@
 //= require bootstrap
 //= require bootstrap/colorpicker
 //= require bootstrap/datepicker
-//= require bootstrap/load-image.min
-//= require bootstrap/image-gallery.min
 //= require jquery-fileupload
 // require jquery.remotipart
 //= require jquery.datetimepicker
+//= require blueimp-gallery-all
 
 function insertAttachment(url,name) {
     var ext = url.split('.').pop().toLowerCase();

app/assets/javascripts/fetmeetings.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/fetmeetingtops.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/