add WindowEngine
Merge branch 'master' into master_2
footer links is working
small fix
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
add base code for login and shoe travels
Merge branch 'WEB_VIEW' into data-access-interface
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
add loging user
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
upgrade web
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
Merge remote-tracking branch 'origin/data-access-interface' into WEB_VIEW
небольшие изменения: появилось окно добавления комментариев для
авторизованных юзеров, добавлено представление Мои Путевки
исправлены отступы в окнах для комментариев
Merge remote-tracking branch 'origin/WEB-VIEW' into
data-access-interface

Conflicts:
	web/target/database-0.0.1-SNAPSHOT/resources/js/main.js