right top list
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/wishLists.js