Expiring and expired drugs reports
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/report_management.php