modified:   smile_android/AndroidManifest.xml
	new file:   smile_android/res/layout/personal_settings.xml
	new file:   smile_android/res/values/color.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	new file:   smile_android/src/com/holding/smile/activity/PersonalSettingsActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java