webservice 线程修改
Merge branch 'dev' of https://github.com/TinderTeam/SmartHome into dev

Conflicts:

code/app/SmartHome-Android/SmartHome/src/cn/fuego/smart/home/ui/home/Hom
eFragment.java