Maps

Fixat så att man kan ändra karttyp i settings
Merge branch 'master' of https://github.com/AdamTorkelsson/openmap

Conflicts:
	src/com/openmap/grupp1/MainActivity.java
	src/com/openmap/grupp1/MyMap.java
	src/com/openmap/grupp1/settings.java