Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/modules/shop
Merge remote-tracking branch 'origin/development' into development