Basket fix, Validation
Merge branch 'master' of https://github.com/keske/life-store

Conflicts:
	src/js/helpers.js
	src/js/vendor/extensions.js