Click hanlder properly disconnected on Cart.js
Merge origin/develop into develop