New settingsActivity, Shuixi UI update
Merge branch 'master' of https://github.com/MiniCap390/HigherApp

Conflicts:
	Higher/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/MiniCap390/HigherApp