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

Conflicts:
	application/views/sections/link.php
changes
Regimen Bulk mapping
Merge branch 'master' of https://github.com/KevinMarete/ADT

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

Conflicts:
	application/views/sections/link.php
	changelog.txt
Bulk mapping regimens and drugs
Merge branch 'master' of https://github.com/jgat2012/ADT