little details
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartHome/src/com/gdgl/activity/ShowDevicesGroupFragmentActivity.java