comit
Merge branch 'master' of https://github.com/aeeb/PhotoCheckin_Android

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