Added Dojo dijit to install and login templates
Minor main template change
Merge branch 'dev.admin-ui' into dev.admin