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

Conflicts:
	application/views/sections/link.php
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/views/sections/link.php
changes
changes
changes
Reports
Inventory bug
changes
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/views/sections/link.php
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/patient_management.php
	application/views/orders/fmap_template.php
changes
changes
changes
Merge branch 'master' of https://github.com/jgat2012/ADT
changes
changes