.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/ProjectTeamF_war_exploded.xml
	ProjectTeamF.iml
	pom.xml
	web/WEB-INF/spring-servlet.xml
	web/WEB-INF/web.xml
.