Added beans for login page
Fixed beans
Merge branch 'master' into oskar
Temp rename
Moved persistence.xml to correct folder
Awesome fixxxx
Merge branch 'oskar'