server upload test successful
Merge remote-tracking branch 'origin/server_upload_patch'

Conflicts:
	golfswingapproach/bin/classes.dex
	golfswingapproach/bin/golfswingapproach.apk
	golfswingapproach/bin/resources.ap_
	golfswingapproach/src/com/zikto/golfswingapproach/MainActivity.java