Map
Får ikke pullaa
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting

Conflicts:
	HIOFCommuting/bin/HIOFCommuting.apk
	HIOFCommuting/bin/classes.dex
	HIOFCommuting/bin/classes/bachelor/tab/TabMap.class
	HIOFCommuting/bin/dexedLibs/android-support-v4-40f52cd62be93f3aecbc5ba16fa03dab.jar
	HIOFCommuting/bin/dexedLibs/facebooksdk-ab4e8f089805244e0279be7acc3f790b.jar