DishSetupAssembler.java updated
Merge branch 'feature' of github.com:ivanevseev/online-cafe into feature

Conflicts:
	cafe/src/main/java/com/scc/services/DishSetupAssembler.java