Renaming image component to img (and its associations), appropriate changes to component.js, updating json in index(html and json) and index-poc. Updating the HTML parser test with new information. Removing the type mapping from the HTML parser.
Renaming image component to img (and its associations), appropriate changes to component.js, updating json in index(html and json) and index-poc. Updating the HTML parser test with new information. Removing the type mapping from the HTML parser.
Merge branch 'master' of github.com:buttreygoodness/boilerplate

Conflicts:
	app/auto-man/index.html
merge
Making changes to json in index.html