inclusão de dependencias do spring e JPA/Hibernate
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/faces-config.xml