merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/eventpool/web/controller/SearchQueryResponse.java
	src/main/webapp/resources/html/order/orderevent.html