后台代码更新
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:

	code/server/SmartHome/src/cn/fuego/smart/home/webservice/down/service/impl/JPushToolImpl.java
Merge branch 'dev' of https://github.com/TinderTeam/SmartHome into dev