Update resource type namespace

resource type modified according to the changes in graffity service.
Merge branch 'master' of https://github.com/ttripp/horizon

Conflicts:
	openstack_dashboard/dashboards/admin/flavors/views.py
	openstack_dashboard/dashboards/project/instances/views.py
	openstack_dashboard/settings.py