Merge pull request #31 from jgat2012/master

Dispensing module
Merged with Abdala dispensing changes
Allow for regimen X to appear in settings multiple times
dispensing history descending order