BaseActivity的修改以及SettingActivity的相关修改！
Merge branch 'master' of https://github.com/huangtao800/waterTip.git

Conflicts:
	src/com/teami/watertip/BaseActivity.java