add initial (non-working) code for User Edit functionality
Merge remote-tracking branch 'origin/master'