Notebook merge
Merge branch 'master' of https://github.com/mindfld/whouse

Conflicts:
	src/main/java/ua/mind/warehouse/domain/entities/storage/Commodity.java
	src/main/java/ua/mind/warehouse/domain/entities/storage/StorageItem.java