Renamed UserupdateController to UsersettingController
Merge origin/develop into develop