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

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json
Patient Status Management in Settings
Check online connection( Inventory)
Merge pull request #17 from jgat2012/master

Patient Status Management in Settings