add map markers and on marker onclick
Merge branch 'master' into mapFragment

Conflicts:
	kARTography/bin/classes.dex
	kARTography/bin/classes/kartography/app/MainActivity.class
	kARTography/bin/kARTography.apk
Merge pull request #30 from koalahamlet/mapFragment

Map fragment