fixed equals from name to ID
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop/src/main/webapp/WEB-INF/templates/desktop/nav.xml