Cart & CartItem tests & implementation  + travis update
Fixed conflicts