Implementing Events

Works getting events from Google
PHP fil för newsfeed
Get events from Google
Merge branch 'events' into develop

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/MainActivity.java
	H-sektionen/src/se/chalmers/h_sektionen/utils/MockTemp.java
fix MockTemp
Merge branch 'develop' into events
test-buildconfig ej ändrat
Linked feed to server instead of dummy text file

Still need to move server connection from main thread
Merge branch 'develop' into facebook

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/MainActivity.java
	H-sektionen/src/se/chalmers/h_sektionen/utils/MockTemp.java
info-develop merge
refactoring
an idea of the structure
added activities, linked activites to onClick from the menu
added animation
Merge branch 'develop' into events

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
All in activity
bin
Test
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