florange
florange
added florange product source
ProductSource implementation for the Florange is done
ProductSource implementation: product category is added
empty FlorangeCategoryRepository
CategoryRepository for Florange is implemented
fucking ass
add new client to insert values
florange progress
productUrl and imageUrl are fixed
fixed null pointer exception
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	app/com/shopservice/Authentication.java
Merge branch 'Development'

Conflicts:
	.gitignore
	app/com/shopservice/Authentication.java
	app/com/shopservice/DatabaseManager.java
	app/com/shopservice/Services.java
	app/com/shopservice/refreshers/PriceFormatRefresher.java
	conf/insetValues
refactoring
Merge remote-tracking branch 'origin/master'