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

Conflicts:
	.htaccess
	application/views/sections/link.php
	changelog.txt
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php