Class diagrams
Fixed test to use the current server
Merge branch 'develop' into robin
Changes time to next event
Merge branch 'footerAnimation' into develop

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/utils/LoadData.java
simple refactoring
updated tests and fixed error view on LunchActivity
Graphic design and text changes + secret
Merge branch 'develop' of https://github.com/jonasberglund/skrubb_DAT255 into develop
Removed unsused string
Merge branch 'develop' into robin
Merge branch 'develop' into facebook

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/BaseActivity.java