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

Conflicts:
	application/views/sections/link.php
	assets/cache/140291076738652f7f20d5676664079c2835f3d210.css
	assets/cache/1402910767e9a47f29389af7f8dc4e6914c9069f53.js
	log.txt
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/views/sections/link.php
	assets/cache/1396962274e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/1397034958e9a47f29389af7f8dc4e6914c9069f53.js
	assets/cache/139868004938652f7f20d5676664079c2835f3d210.css
	assets/cache/139927228038652f7f20d5676664079c2835f3d210.css
	assets/cache/140291076738652f7f20d5676664079c2835f3d210.css
	assets/cache/1402910767e9a47f29389af7f8dc4e6914c9069f53.js
	log.txt
changes
Merge branch 'master' of https://github.com/jgat2012/NASCOP

Conflicts:
	application/views/sections/link.php
	assets/cache/140137000638652f7f20d5676664079c2835f3d210.css
	assets/cache/1401370006e9a47f29389af7f8dc4e6914c9069f53.js