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

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