blank space in cookie fixed
Merge remote-tracking branch 'origin/1.0' into 1.0

Conflicts:
	.idea/workspace.xml
Put in new array of products