Merged
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	assets/cache/13783840526b643dd89797e523514f23999360dbd5.js
	dbassets/cache/13783874966b643dd89797e523514f23999360dbd5.js
	assets/cache/13783877156b643dd89797e523514f23999360dbd5.js
Issues
Merged
Progress Bar
EWI
EWI
drugcodes and doses
Pill count adherence
Patient enrolled
TableTools
Session Settings
Patients who changed regimen report
Facility Dashboard
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
application/controllers/facilitydashboard_management.php
some bugs