UserTest update
UserTest updated
UserTest finished
Merge remote-tracking branch 'origin/flo' into test

Conflicts:
	Skeleton/src/main/webapp/pages/login.jsp
UserTest finished. again
AdvertTest finished
SignupFormTest finished
AdFormTest finished
removed unused imports of tests
EventTest finished
CalendarTest started
CalendarTest finished
BookmarkTest finished
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	Skeleton/src/main/java/ch/studihome/jspserver/model/Event.java
fixed some test errors
MessageTest finished
InviteTest finished
AlertTest finished
SearchFormTest finished
ProfileFormTest finished
MessageFormTest finished