setting about version ui for upadate
Merge branch 'master' of https://github.com/xjy2061/bp.git

Conflicts:
	beautyplan/AndroidManifest.xml
	beautyplan/res/values/strings.xml
	beautyplan/src/com/trianglegroup/android/beautyplan/fragment/SettingFragment.java