user settings added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/artists.server.controller.js
change user password fix
Merge artist fix

Conflicts:
	app/controllers/artists.server.controller.js
Merge users fix

Conflicts:
	app/controllers/users.server.controller.js
Merge remote-tracking branch 'origin/master'