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

Conflicts:
	CSS/style.css
	application/controllers/report_management.php
Edit Dispense
Edit Patient
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
	application/controllers/dispensement_management.php
	application/controllers/report_management.php
Fix dispensing