conflict test
Merge branch 'master' of git@github.com:MR-HU/Express.git

Conflicts:
	src/com/zjut/express/activity/MainActivity.java