Save order changes
Merge branch 'dev' of git@github.com:icehockeystar/militaryshop.git into dev

Conflicts:
	src/main/java/com/euroit/militaryshop/service/impl/OrderServiceImpl.java