update
dderge branch 'master' of https://github.com/weiyuanke/stack

Conflicts:
	horizon/horizon/dashboards/instances/images/urls.py
	horizon/horizon/dashboards/instances/images/views.py