using static import for queries now
removed try catch block from test
Merge branch 'master' into step3

Conflicts:
	shop/repository/order/src/main/java/com/comsysto/shop/repository/order/impl/OrderRepositoryImpl.java