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

Conflicts:
	CSS/style.css
	application/controllers/facilitydashboard_management.php
	application/views/sections/head.php