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

Conflicts:
	horizon/horizon/dashboards/resource/services/panel.py
	horizon/horizon/templates/base.html
	horizon/horizon/templates/indbase.html
update
Merge branch 'master' of https://github.com/weiyuanke/stack
update