.
Merge branch 'master' of https://github.com/nigl1011/swe.git

Conflicts:
	shop/src/main/resources/sql/create.sql
	shop/src/main/resources/sql/delete.sql