error user
Merge branch 'master' of https://github.com/zzlmilk/008App

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/zzlmilk/008App

Conflicts:
	.DS_Store
CollectionSearch ViewEdit and weiboLogin