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

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb

app/models/calentry.rb

@@ -11,6 +11,9 @@ class Calentry < ActiveRecord::Base
   def start_time
     start
   end
+  def start1
+    start.to_date
+  end
   def name
 	summary
   end