Merge remote-tracking branch 'thomasb/master'

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,8 +1,4 @@
 Fetsite::Application.routes.draw do
-  
- 
-
-
   devise_for :users
   resources :home, :only=>[:index]
   #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -13,8 +9,6 @@ Fetsite::Application.routes.draw do
     get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
   end
 
-  devise_for :users
-
   resources :pages, :except => [:index] do
     member do
       post 'preview'