fixed checkout, labels, basket
Merge branch 'develop'