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

Conflicts:
	nova/tools/pip-requires
Merge branch 'master' of https://github.com/weiyuanke/stack
update