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

Conflicts:wewe
	Export/Current Patients By ART Sites.xls
	wapplication/controllers/dashboard_management.php
	application/views/dashboard/main_v.php
	application/views/sections/link.php
	assets/cache/139281551838652f7f20d5676664079c2835f3d210.css
	assets/cache/1392840800db1fd474fa892a5f41f1f257dbfaeb7e.js
	assets/cache/1392840800e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/139325057838652f7f20d5676664079c2835f3d210.css
	assets/cache/139461691638652f7f20d5676664079c2835f3d210.css
	assets/cache/1394616916e9a47f29389af7f8dc4e6914c9069f53.js
changes
changes
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:s
	application/controllers/dashboard_management.php
	application/views/dashboard/main_v.php
	application/views/sections/link.php
	assets/cache/139281551838652f7f20d5676664079c2835f3d210.css
	assets/cache/1392840800db1fd474fa892a5f41f1f257dbfaeb7e.js
	assets/cache/139325057838652f7f20d5676664079c2835f3d210.css
	assets/cache/139461691638652f7f20d5676664079c2835f3d210.css
	assets/cache/1395233744e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1395241263e9a47f29389af7f8dc4e6914c9069f53.js
dashboard
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Conflicts:
	application/controllers/order.php