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

Conflicts:
	application/controllers/dispensement_management.php
	application/views/sections/link.php
	assets/viral_load.json
Merge branch 'master' of https://github.com/KevinMarete/ADT
Import order: Posting order to either escm or Nascop
Merge pull request #34 from jgat2012/master

Order:Importing