done template cleanup for 'poll' and 'courses'
Merge branch 'master' of https://github.com/stabone/papillon