text and valu converter
diff
Merge branch 'master' of https://github.com/kuyluk/TrackerProject

Conflicts:
	src/main/webapp/WEB-INF/jsp/teamDetails.jsp