nothing much
Merge branch 'master' of https://github.com/dacooney/AdMe.git

Conflicts:
	Adme_v1/bin/Adme_v1.apk
	Adme_v1/bin/classes.dex
	Adme_v1/bin/res/drawable-hdpi/splash_screen1.png
	Adme_v1/bin/resources.ap_
Fix