Base admin template
Merge branch 'master' into develop

* master:
  Base admin template