情景模式设置功能已经完成
Merge https://github.com/happyhls/iProfiles

Conflicts:
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/me/happyhls/iprofiles/MainListActivity.class
	bin/classes/me/happyhls/iprofiles/MainListFragment$1.class
	bin/classes/me/happyhls/iprofiles/MainListFragment$2.class
	bin/classes/me/happyhls/iprofiles/MainListFragment.class
	bin/classes/me/happyhls/iprofiles/R$drawable.class
	bin/classes/me/happyhls/iprofiles/R$id.class
	bin/classes/me/happyhls/iprofiles/R$layout.class
	bin/classes/me/happyhls/iprofiles/R$string.class
	bin/classes/me/happyhls/iprofiles/R$style.class
	bin/classes/me/happyhls/iprofiles/R$xml.class
	bin/classes/me/happyhls/iprofiles/profiles/ProfileFragment.class
	bin/classes/me/happyhls/iprofiles/profiles/ProfileSettingsActivity.class
	bin/classes/me/happyhls/iprofiles/tools/DBHelper.class
	bin/classes/me/happyhls/iprofiles/tools/ProfilesDBHelper.class
	bin/dexedLibs/android-support-v4-581559278b4533b5a6f0cf0ae5441142.jar
	bin/iProfiles.apk
	bin/resources.ap_
	gen/me/happyhls/iprofiles/R.java
	src/me/happyhls/iprofiles/MainListActivity.java
	src/me/happyhls/iprofiles/MainListFragment.java
	src/me/happyhls/iprofiles/profiles/ProfileFragment.java
	src/me/happyhls/iprofiles/profiles/ProfileSettingsActivity.java
	src/me/happyhls/iprofiles/tools/DBHelper.java
	src/me/happyhls/iprofiles/tools/ProfilesDBHelper.java
解决git 冲突