.
Merge branch 'master' of git@github.com:syspot/cenajur.git

Conflicts:
	build/classes/br/com/cenajur/faces/AutenticacaoFaces.class
	build/classes/br/com/cenajur/faces/ColaboradorFaces.class
	build/classes/br/com/cenajur/model/Agenda.class
	build/classes/br/com/cenajur/model/Cliente.class
	build/classes/br/com/cenajur/model/Processo.class