added CartActivity, E17, E13
fixed remaining conflicts
Merge pull request #4 from Intuitive/Fifi2

Fifi2