Merge remote-tracking branch 'tim/working_editor'
Merge remote-tracking branch 'tim/master'
Merge remote-tracking branch 'tim/working_admin'
Some bugfixes for external networks
Some fixes for templates
Merge branch 'master' of https://github.com/dswd/ToMaTo