Starfish_Baseline基线版本
Merge branch 'master' of https://github.com/youngsoulBB/Starfish_Baseline

Conflicts:
	AndroidManifest.xml
	res/raw/system.properties
	res/values/strings.xml
	src/com/io/bitbrothers/common/framework/ui/BaseGroupActivity.java
	src/com/io/bitbrothers/common/util/Logger.java
	src/com/io/bitbrothers/starfish/application/CommonContext.java
	src/com/io/bitbrothers/starfish/application/StarfishApplication.java