Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Merge pull request #192 in YIN/basic from hotfix/YCB-62cart to develop

* commit '8005a60b1f463711393a7c3165a68274c185e0f8':
  Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop