Merge branch 'hotfix-0.1.1' into staging
add admin link to home page
Merge branch 'hotfix-0.1.2' into develop