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

config/routes.rb

@@ -1,10 +1,5 @@
  Fetsite::Application.routes.draw do
-     
-  resources :calendars
-
-
-  resources :calentries
-
+    
    devise_for :users
    resources :home, :only=>[:index]
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -50,7 +45,9 @@
      resources :home, :only=>[:index]
      get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
      resources :beispiele
-
+ 
+  resources :calendars
+  resources :calentries
    end
 
    # The priority is based upon order of creation: