Repair maven & added sorting options
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	prototype/ShoppingCart/.idea/workspace.xml