base
Merge branch 'develop' of https://github.com/stserakhau/andrey_korzhenevsky into develop
Merge branch 'develop' of https://github.com/stserakhau/andrey_korzhenevsky into develop

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/AdminController.java
Merge branch 'develop' of https://github.com/stserakhau/andrey_korzhenevsky into develop

Conflicts:
	borsch-web/src/main/webapp/WEB-INF/jsp/views/admin/orders.jspx