FORCED COMMIT
Merge branch 'master' of https://github.com/lkb123/cqas

Conflicts:
	application/controllers/mainframe.php