wiped out singleton dependency of templater to markupmgr

Reviewers: anh-chrome

Reviewed By: anh-chrome

Differential Revision: http://phabricator.burningreality.de/D103
Merge branch 'templater_less_singleton'