调整代码结构
Merge branch 'master' of github.com:timeblink/cm-work

Conflicts:
	gerrit_salad.py