ModularPresenter now passes $themeDir variable to templates.
Merge branch 'master' of github.com:annotatecms/annotatecms

Conflicts:
	Application/UI/ModularPresenter.php