test
finished new layout
Merge branch 'master' of https://github.com/corn6028/iHelp-android into corn6028-master

Conflicts:
	app/src/edu/stu/db/CityAdapter.java
	app/src/edu/stu/ihelp/client/General.java
	app/src/edu/stu/tool/Locate.java
Merge branch 'corn6028-master'