Merge branch 'release/1.0.13' into develop
-Added TODO comment
-Version bump after release
Merge branch 'hotfix/1.0.14' into develop

Conflicts:
	Gruntfile.js
	bower.json
	package.json
-Version bump after hotfix
-Removed old TemplateManager code
-Fixed constructor bug
-Fixed constructor bug
-Version bump for release
Merge branch 'release/1.0.15'