Basic dev environment for tinkering with web admin.
Merge remote-tracking branch 'origin/master'