get working map activity
Merge branch 'master' into workingMapActivity

Conflicts:
	kARTography/AndroidManifest.xml
	kARTography/bin/classes.dex
	kARTography/bin/classes/kartography/models/Poi.class
	kARTography/bin/kARTography.apk
	kARTography/bin/resources.ap_
get adapter working with parse
get geopoints uploading for photos
Merge branch 'master' into workingMapActivity

Conflicts:
	kARTography/bin/classes.dex
	kARTography/bin/kARTography.apk
	kARTography/bin/resources.ap_
Merge pull request #23 from koalahamlet/workingMapActivity

Hey guys, check it out! @sdobek @medha @vnu @finnishslavic