张海龙1210
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/area/EnvironMange/ui/CenterActivity.java
	src/com/area/EnvironMange/ui/LoginActivity.java