fix picture url
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/neuigkeiten/show.html.erb
app controller
login fix
Merge branch 'master' of github.com:fetsite/fetsite

Conflicts:
	app/controllers/application_controller.rb