testes
Merge branch 'master' of https://github.com/fabioaround/ProjetoBanco

Conflicts:
	protected/controllers/ListaPessoaController.php