remove new_resource.template from the graph provider because it doesn't make sense; template is a graph_item property
Merge branch 'graph_items_from_hosts' into integration

Conflicts:
	providers/graph.rb