eee
Merge branch 'master' of https://github.com/Stargoniy/MyPal
Merge branch 'master' of https://github.com/Stargoniy/MyPal
Merge branch 'master' of https://github.com/Stargoniy/MyPal
validator
commit
Merge branch 'master' of https://github.com/Stargoniy/MyPal

Conflicts:
	src/main/webapp/index.jsp