saass
Merge branch 'gad' of https://github.com/MSeGS/cms into gad

Conflicts:
	application/modules/gad/controllers/IndexController.php