Merge remote-tracking branch 'origin/master' into andreas
new banner
worked on design
Merge remote-tracking branch 'origin/master' into andreas
changes
Moved persistence.xml
Merge branch 'oskar'
bb and ctrl for sign up
a
merge
log in
log in files
Merge branch 'master' into oskar