a;slfkjsad;f
Merge branch 'master' of github.com:haipn/togoparts

Conflicts:
	AndroidManifest.xml
	src/sg/togoparts/login/LoginActivity.java
	src/sg/togoparts/login/MergeAccount.java