d
deng
0
Merge branch 'master' of https://github.com/ss-android/android-ss.git

Conflicts:
	AndroidManifest.xml
	res/values/color.xml
	res/values/strings.xml
	src/com/activity/company/community/CommunityActivity.java
	src/com/activity/company/honor/Honour_Activity.java
	src/com/activity/company/produce/ProduceActivity.java
	src/com/activity/company/quality/QualityActivity.java
	src/com/http/company/CommunityApi.java
	src/com/http/company/IntroduceApi.java
	src/com/http/company/QualityApi.java
	src/com/sansheng/db/OrmDateBaseHelper.java