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)
Drug Label Issues
1.Fixed Adherence calculations on patient details
2.Started on graphical adherence report
3.Fixed Drug label sizes
Merge pull request #17 from jgat2012/master

Patient Status Management in Settings
merge with abdala after patient status fix
Dispense Issues
1.Fixed empty qty
2.Fixed allergy issue
adherence computations
Testing .htaccess on Linux
Inventory problem, source destination bug fixed
Merge branch 'master' of https://github.com/jgat2012/ADT
System management checkConnection bug fixed
Merge branch 'master' of https://github.com/KevinMarete/ADT

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
update
Merge pull request #18 from jgat2012/master

	System management checkConnection bug fixed
htaccess link
Fix bug in updatePatientData function in auto management
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge pull request #19 from jgat2012/master

Bug in auto management fixed