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

Conflicts:
	application/views/sections/link.php
	assets/cache/140137000638652f7f20d5676664079c2835f3d210.css
	assets/cache/1401370006e9a47f29389af7f8dc4e6914c9069f53.js
changes
changes
Settings Issues
1.fixed version handler for webadt systems in the field
2.Settings view display removed overflow in datatable
version settings
1.updated repo name to nascop
2.fixed git version function
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	application/views/sections/link.php