Linkies fixed!
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/private/user/category/categorylist.xhtml
	src/main/webapp/private/user/dashboard/orders.xhtml