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
Merge branch 'develop' into events
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
Load in background image
testneewsfeed
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
Some tests,
Merge branch 'develop' into infotest
Merge branch 'develop' into suggest