wrong sql file have been removed
Wrong CMS classes have been deleted
Merge branch 'origin/sandbox'

Conflicts:
	application/models/CMSBlocks.php
	application/models/generated/BaseCMSBlocks.php
	application/models/generated/BaseCMSBlocksData.php
	application/models/generated/BaseCMSPages.php
	application/models/generated/BaseCMSPagesData.php