Enviando para merge
Merge branch 'master' of https://github.com/nicholasio/SibbSys

Conflicts:
	application/modules/admin/views/layouts/layout.phtml