thinp
Merge branch 'master' of https://github.com/potter219/VNPT

Conflicts:
	src/com/example/vnpt/ActivityLogin.java
aa
thinp