08:18
08:25
Merge branch 'master' of https://github.com/juniorperfoll/educacional

Conflicts:
	.gitignore
	app/Controller/BancosController.php
	app/View/Bancos/index.ctp
	app/View/Elements/menuColaborador0.ctp

	modified:   app/Controller/BancosController.php
	modified:   app/View/Bancos/index.ctp
	modified:   app/View/Elements/menuColaborador0.ctp