port user/edit changes from upstream
Copy over admin templates from upstream (Closes #101)
Merge remote-tracking branch 'origin/master'