Reports bugs fixed
Merge branch 'master' of https://github.com/KevinMarete/ADT
Conflicts:
	application/config/database.php
	application/views/sections/link.php
Merge branch 'master' of https://github.com/jgat2012/ADT
changes