Merge branch 'develop' into events
Changed InfoActivity to use AsyncTask instead of Thread
Event
Manual test case added, error view added
Merge branch 'infotest' into events
Load in background image
Fredagsfest
Merge branch 'events' into develop
Merge branch 'facebook' into develop

Conflicts:
	H-sektionen/res/values/strings.xml
	H-sektionen/src/se/chalmers/h_sektionen/MainActivity.java
	H-sektionen/src/se/chalmers/h_sektionen/utils/MockTemp.java
fix
Merge branch 'develop' into facebook