Merge remote-tracking branch 'origin/master' into andreas
new banner
Added beans for login page
Merge branch 'linnea'
Fixed beans
worked on design
Merge remote-tracking branch 'origin/master' into andreas
changes
Merge branch 'master' into oskar
Moved persistence.xml
Temp rename
Moved persistence.xml to correct folder
Awesome fixxxx
Merge branch 'oskar'
bb and ctrl for sign up
a
merge
log in
log in files
Added test file for sample product additions