DataTable
BaseURL
Merge branch 'master' of https://github.com/Ellyosmark/SysMMModa

Conflicts:
	application/layouts/scripts/layout.phtml
Merge branch 'master' of https://github.com/Ellyosmark/SysMMModa

Conflicts:
	application/layouts/scripts/layout.phtml
Merge remote-tracking branch 'origin/master'