template manager tests
Merge branch 'develop' of github.com:SocietyPro/html5-pollmaster into develop
template manager test refactor
Merge branch 'develop' of github.com:SocietyPro/html5-pollmaster into develop