Automatic user login after registration
Message detail view displays fromUser
Reload user object in session
Refactored invite and event
Added renamed invite page
Event is now added to the calendar of both users
pic upload fixed white space reduced
Merge branch 'flo'

Conflicts:
	Skeleton/src/main/java/ch/studihome/jspserver/controller/BookmarkController.java
	Skeleton/src/main/webapp/pages/advert.jsp
	Skeleton/src/main/webapp/pages/login.jsp
Bugfix: Adverts were not shown after first login. Added temporary fix.
Merge branch 'master' of github.com:ese-unibe-ch/ese2014-team6
fixed display bug on register page and colored all error messages
fixes #7
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	Skeleton/src/main/java/ch/studihome/jspserver/model/Event.java