Merge pull request #27 from jgat2012/master

Finally fixed bug in generating D-MAPS
ordering /highcharts issues
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php