добавила скроллы
Merge branch 'master' of https://github.com/balmaster/WebTemplates

Conflicts:
	src/main/webapp/css/main.css