Fixed missing templates in MANIFEST.in
Merge branch 'hotfix/2014.04.24.2' into develop