Ny branch för ProfileController
Added some logic in settingsValidator.
Merge master with ProfileController branch