Adding concepts from 1.7 to 1.9
Merge branch 'development' of github.com:BaobabHealthTrust/HTC_Module