County report generation
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Ftp server test: removed function
Merge drugs in Settings
Calcute issued drugs in county reports base on merging drugs
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/views/sections/link.php
	assets/cache/1396962274e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1402910767e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/141147078338652f7f20d5676664079c2835f3d210.css
	assets/cache/141158250938652f7f20d5676664079c2835f3d210.css
	assets/cache/141225576938652f7f20d5676664079c2835f3d210.css
	assets/cache/1412255784e9a47f29389af7f8dc4e6914c9069f53.js
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/views/sections/link.php
	assets/cache/1396962274e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1402910767e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/141147078338652f7f20d5676664079c2835f3d210.css
	assets/cache/141158250938652f7f20d5676664079c2835f3d210.css
	assets/cache/141225576938652f7f20d5676664079c2835f3d210.css
	assets/cache/1412255784e9a47f29389af7f8dc4e6914c9069f53.js

Signed-off-by: jgat2012 <gauthierabdala@gmail.com>
Automatically merge default drugs
Merge pull request #6 from jgat2012/master

Drugs Merging and County Report