Changes to admin logic and templates
Merge branch 'master' of https://github.com/bugsancho/EventSystem