price format for Hotline was changed
price format for Hotline was changed (date)
Merge branch 'Development'

Conflicts:
	app/com/shopservice/pricelist/models/price/Category.java
	app/com/shopservice/pricelist/models/price/Price.java