Merging Tobin's team's code into our repo

I have resolved all the conflicts that resulted from merging the two branches in one commit https://github.com/k-joseph/openmrs-module-chartsearch/commit/951084fdabdfb15da9133b92e819a6f712c15172