无大改动，等待后台接口
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartLife/gen/com/smartlife/activity/R.java