add an icon field to hardware types, image types, providers,
services, and templates.
fix parameter names.
update changelog.
Merge remote-tracking branch 'origin/develop' into feature/add-icon

Conflicts:
	CHANGELOG.md
fix merge problem with duplicate functions.
Merge pull request #431 from continuuity/feature/add-icon

Feature/add icon