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

Conflicts:
	CHANGELOG.md
Minor cleanup
Add Hive, update default size to xlarge, reduce heap sizes, and setup zookeeper configuration
fix merge problem with duplicate functions.
Use a larger container for MapReduce
Import hadoop_wrapper version 0.1.7
Merge remote-tracking branch 'origin/develop' into feature/update-templates

Conflicts:
	config/defaults/clustertemplates/hadoop-distributed.json
	config/defaults/clustertemplates/hadoop-singlenode.json
renaming APIs. Increasing the version and taking out loom from the
path since it doesn't mean anything.
Merge remote-tracking branch 'origin/develop' into feature/api-rename

Conflicts:
	server/src/test/java/com/continuuity/loom/http/LoomClusterHandlerTest.java
fix small doc error.
Server expects the provisioner fields in a hardware type to be
a flat map of string to string, so flattening the hardware type
informational fields.
Merge pull request #431 from continuuity/feature/add-icon

Feature/add icon
changing format of disks field to a csv of pairs.
fix small typo.
Merge pull request #436 from continuuity/feature/api-rename

Feature/api rename