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

Conflicts:
	AndroidManifest.xml
	res/layout/activity_about.xml
	res/values/strings.xml
	src/com/companies/companies.java