modify chashao and stomach
my last commit before m3
Merge branch 'my3dbr' of https://github.com/dlin-talend/miam into my3dbr