fsdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/HackathonContactShare.apk
	bin/classes.dex
	bin/classes/com/amazon/hackathon/contactshare/activity/MainActivity.class