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

Conflicts:
	horizon/horizon/templates/base.html
update
update
add icon_path to baseaction
Merge branch 'master' of https://github.com/weiyuanke/stack
fix bug