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

Conflicts:
	assets/viral_load.json
link
Design issues and dispensing bugs
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
drug prophylaxis issue and enable/disable links in patient listing
prompt who stage on start art & add/edit patient displaced divs
Merge pull request #40 from wambuimungai/master

drug prophylaxis and enable/disable link in patient listing
Merge branch 'master' of https://github.com/jgat2012/ADT into jgat2012-master

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json
Merge branch 'jgat2012-master'
stock transaction -expiry date notification
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge pull request #42 from wambuimungai/master

stock transaction -expiry date notification
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
	assets/nascop.txt
patient multiselect bug
sanitizing patient details form
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge pull request #44 from wambuimungai/master

sanitized patient details form and other minor file changes
no patient info displayed