dashboard
Merge branch 'master' of https://github.com/jgat2012/NASCOPw

Conflicts:
	application/views/dashboard/main_v.php
dashboard
dashboard
settings
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:ww
	Export/Stock.xls
	application/controllers/order.php
	application/views/sections/link.php
	assets/cache/139266487138652f7f20d5676664079c2835f3d210.css
	assets/cache/139275217538652f7f20d5676664079c2835f3d210.css
	assets/cache/139280119038652f7f20d5676664079c2835f3d210.css
dashboard
auto logout
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Fix bug in ART adults and paeds patients chart