Merge pull request #6 from jgat2012/master

Drugs Merging and County Report
merge with abdala
added max_files_upload to 200
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/views/sections/link.php
	assets/cache/1413362768e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1414137346e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1415904869e9a47f29389af7f8dc4e6914c9069f53.js