added methods for the modification of the product
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/com/shopservice/ClientSettingsService.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/com/shopservice/ClientSettingsService.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/com/shopservice/ClientSettingsService.java
	app/com/shopservice/domain/ClientSettings.java
	app/com/shopservice/refreshers/PriceFormatRefresher.java
Merge remote-tracking branch 'origin/master'
implement CategoryQueries, implements methods modifyUrl,modifyImageUrl, added getCategoriesQuery