完善圈子系统
add circleList
edit manifest
Merge branch 'master' of https://github.com/Jayin/SiyuanGroup

Conflicts:
	SiyuanGroup/AndroidManifest.xml