settings page added
Merge branch 'develop' of https://github.com/lichuanr/CarNex into develop
settings changes