Fixing some conflicts
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/private/user/dashboard/orders.xhtml
	src/main/webapp/private/user/order/orderConfirmation.xhtml