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

Conflicts:
	assets/viral_load.json
Merge pull request #38 from wambuimungai/master

faq database table
Design issues and dispensing bugs
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
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