Merge branch 'master' into tim_dev
add attach demo on /admin/...
move footer to the admin tab
Merge branch 'tim_dev' of https://github.com/tosqa/tosqa-host into tim_dev