moving settings from action bar
Merge branch 'master' of github.com:BathUniApp/bath-uni-app