SEMUA HAL
Merge branch 'master' of https://github.com/farahs/pockettrainer

Conflicts:
	bin/classes/com/pockettrainer/MainActivity.class
	bin/classes/com/pockettrainer/MainDashboard.class
	project.properties
Merge branch 'master' of https://github.com/farahs/pockettrainer