Fixed bug on Settings that was crashing the program when a user tried to change their user name to an existing username
Merge origin/master