add back button
Merge branch 'master' of https://github.com/pedrogusman/Manager

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