aafsf
Merge branch 'master' of github.com:haipn/togoparts

Conflicts:
	src/sg/togoparts/login/LocationActivity.java