修改 project.properties
Merge branch 'master' of https://github.com/WinHuStudio/AndroidClient4iTrip

Conflicts:
	src/project.properties
Merge branch 'master' of https://github.com/WinHuStudio/AndroidClient4iTrip

Conflicts:
	src/AndroidManifest.xml
	src/project.properties
	src/res/layout/activity_login.xml
	src/res/values/styles.xml
	src/src/com/itrip/activity/LoginActivity.java
Merge branch 'master' of https://github.com/WinHuStudio/AndroidClient4iTrip

Conflicts:
	src/res/layout/activity_login.xml
	src/res/values/style.xml
	src/res/values/styles.xml
	src/src/com/itrip/activity/LoginActivity.java