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

Conflicts:
	application/views/sections/link.php
Merge branch 'master' of https://github.com/KevinMarete/ADT
Routine refill bug when dispensing
Routine refill fix
bugs
Merge branch 'master' of https://github.com/jgat2012/ADT
Patient listing
Merge branch 'master' of https://github.com/wambuimungai/ADT

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

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