Complete concept pass on den
Merge pull request #3 from lizleon/Develop

Complete concept pass on den
Merge branch 'Develop' into Feature-Conversation