Configuração do spring
Inclusão do projeto do quartz
Merge branch 'master' of https://github.com/dvpalex/labprimefacesws

Conflicts:
	labprimefaces/WebContent/WEB-INF/faces-config.xml
	labprimefaces/pom.xml