Har ikke gjort noe
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting

Conflicts:
	HIOFCommuting/bin/AndroidManifest.xml
	HIOFCommuting/project.properties