Merge branch 'master' of https://github.com/karenhovhannisian/iguan_payment

Conflicts:
	src/main/webapp/WEB-INF/pages/list-of-teams.jsp