Finished up work on base.html
Merge branch 'master' of https://github.com/tu-software-studio/org