Merge pull request #1404 from mahagr/master

Admin: Remove unused messages and topicicons views (code cleanup), model work
Fix #1407: Template Manager gives 500 Internal Server Error