complaint
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_my_complaint.xml
	src/com/wb/sc/adapter/CategoryAdapter.java
Merge branch 'master' of https://github.com/liangbxbaoxian/SmartCommunity