Merge pull request #1 from wastemobile/paris

添加 concept.md 文件
update concept.md from master
update and fix conflict concept