buggy
Merge branch 'master' of github.com:Nnamber/htwg.langenacht.aesr
bugfix
added modalwindow for importer + improved

Merge branch 'master' of github.com:Nnamber/htwg.langenacht.aesr

Conflicts:
	app/controllers/imports_controller.rb