uploading
Merge branch 'master' of https://github.com/topinho22/TEpSU

Conflicts:
	App-Android/bin/TEpSU.apk
	App-Android/bin/resources.ap_