test-buildconfig ej ändrat
added openinghours and links to info view
info-develop merge
refactoring
an idea of the structure
added activities, linked activites to onClick from the menu
Merge branch 'events' into develop

Conflicts:
	H-sektionen/AndroidManifest.xml
	H-sektionen/bin/AndroidManifest.xml
	H-sektionen/res/values/strings.xml
	H-sektionen/src/se/chalmers/h_sektionen/EventsActivity.java
	H-sektionen/src/se/chalmers/h_sektionen/MainActivity.java
fix
Merge branch 'develop' into events