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

config/locales/de.yml

@@ -1,6 +1,7 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 de:
+  ohnezuordnung: "Ohne Zuordnung"
   hello: "Hallo Welt"
   common:
     edit: "Bearbeiten"

config/routes.rb

@@ -46,6 +46,7 @@
      resources :moduls
      resources :lvas
      resources :neuigkeiten
+		 resources :fragen
      get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
 
      resources :rubriken do