Merge branch 'develop' of https://github.com/jimmycao/tmp-res into develop
add bulk of changes in hamster-core side
Merge branch 'develop' of https://github.com/leftnoteasy-tmp/tmp-res into develop