Alteracoes

alteracoes
comit

cmotit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/configs/application.ini
	application/layouts/scripts/cadastro.phtml
	application/views/scripts/index/index.phtml
	public/js/login.js