Merge branch 'develop' into events
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
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
Merge branch 'develop' into events
Merge branch 'backandtilt' into develop
Added suggest gui and logic
AndroidManifest fix
Added loading of feed in background

Also redesigned NewsAdapter
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
Changed InfoActivity to use AsyncTask instead of Thread
Event
Manual test case added, error view added
Merge branch 'infotest' into events