Close #1
Close #2
Merge branch 'refs/heads/upgrade_structure'

Conflicts:
	component.json
	test/TemplateReplace.coffee