Completed profile update/edit - including tests.
Merge remote-tracking branch 'origin/master'