Encoding set to UTF8
Merge branch 'master' into dronka_ex1

Conflicts:
	src/pl/edu/agh/dronka/shop/model/Category.java
	src/pl/edu/agh/dronka/shop/model/provider/ShopProvider.java
	src/pl/edu/agh/dronka/shop/model/util/PropertiesHelper.java
	src/pl/edu/agh/dronka/shop/view/PropertiesPanel.java