test
Merge branch 'master' of https://github.com/PJCCStudios/WFEM

Conflicts:
	AndroidTEST/bin/AndroidTEST.apk
	AndroidTEST/bin/resources.ap_
	AndroidTEST/res/layout/activity_main.xml
rwar