Adding resource type. Removing the hardcoded url for graffiti
Adding Volumes as a boot source
Merge branch 'master' of https://github.com/ttripp/horizon

Conflicts:
	openstack_dashboard/dashboards/project/instances/views.py