Merge branch 'master' of D:\OpenProject\ChangshaHouse_Android with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/user_register.xml
dd