get adapter/picasso talking
Merge branch 'master' into workingMapActivity

Conflicts:
	kARTography/bin/classes.dex
	kARTography/bin/kARTography.apk
	kARTography/bin/resources.ap_