Merge remote-tracking branch 'origin/v1.0' into grid-dto

Conflicts:
	src/by/rofor/web/grid/SupplierDatatableGridImpl.java