Added the first classes for testing
Merge branch 'master' of https://github.com/AdamTorkelsson/openmap

Conflicts:
	AndroidManifest.xml
	src/com/openmap/grupp1/TutorialPopupDialog.java
	src/com/openmap/grupp1/database/LocationMarker.java