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

Conflicts:
	Export/ART Patients Scale Ups Trends.xls
	application/views/sections/link.php
	assets/cache/13909992417b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13916806207b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/139168131949f25aa95fd49fa6ddbc7412f58cee6b.css
changes
orders API
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:
	Export/ART Patients Scale Up Trends.xls
	application/views/sections/link.php
	assets/cache/13909992417b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/1391692506b8f1d40c05735fe8c534f860e905a27f.jsww
	assets/cache/139169366849f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/1391693668b8f1d40c05735fe8c534f860e905a27f.js
	assets/cache/139169485649f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/1391758324b8f1d40c05735fe8c534f860e905a27f.js
templates
orders
orders
orders
orders
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Conflicts:
	Export/Current Patients By ART Sites.xls
	application/views/sections/link.php
	assets/CSS/style.css
	 assets/cache/139169366849f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139181072249f25aa95fd49fa6ddbc7412f58cee6b.css
	assets/cache/139189279049f25aa95fd49fa6ddbc7412f58cee6b.css