Restore missing merges

In the process of "Merge pull request #91 from thewheat/concept-conversation-v2", accidentally reverted previous merged pull requests / commits

https://github.com/OpenMRS-Australia/openmrs-cpm/commit/7f84c1a8ef885814107db4edf1c522eb94b53587