Merge branch 'jsNotification' into report-branch
fix menu
fix order
Merge branch 'master' into report-branch

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/ReportController.java
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/ViewURLs.java
	borsch-web/src/main/webapp/WEB-INF/jsp/orderReport.jsp
Merge branch 'master' into report-branch

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/ReportController.java
	borsch-web/src/main/webapp/WEB-INF/jsp/orderReport.jsp
Fixed remember-me feature
add orderTable
Merge branch 'master' of https://github.com/skrauchenia/borsch

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/ReportController.java
	borsch-web/src/main/resources/messages.properties
	borsch-web/src/main/webapp/WEB-INF/jsp/menu.jsp
	borsch-web/src/main/webapp/WEB-INF/jsp/orderReport.jsp
	borsch-web/src/main/webapp/WEB-INF/tags/navbar.tag
Added table for menuItems
Merge remote-tracking branch 'origin/master' into db

Conflicts:
	borsch-core/src/main/java/com/exadel/borsch/entity/Course.java
	borsch-core/src/main/java/com/exadel/borsch/entity/MenuItem.java
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/MenuController.java
	borsch-web/src/main/resources/messages.properties