рефакторинг кода
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/corejsf/bean/config/ShopWizard.java
	src/main/java/com/entity/Address.java
	src/main/java/com/entity/Shop.java
	src/main/webapp/addshop.xhtml
рефакторинг кода