Moving from the java service to the python service. Just Glance
Merge branch 'master' of https://github.com/ttripp/horizon

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