Merge pull request #17 from flower-pot/develop

plain layout can be rendered for every view
Merge pull request #18 from flower-pot/develop

Develop
Main Layout rewritten in haml
Navbar added
changed buttons to links
add alerts
changed rednder plain layout
error message moved to top
Merge branch 'mainlayout' into develop
Merge pull request #19 from jannishuebl/develop

Develop
add link to profile
Merge branch 'mainlayout' into develop
Merge pull request #20 from jannishuebl/develop

Develop
change login field from email to text

email field forced one to use the email for login even though login
works with username and email