MAC
Merge branch 'master' of https://github.com/JAGormley/JAGAndroidFramework

Conflicts:
	bin/JAGAndroidFramework.apk
	bin/resources.ap_