Added a cart (no merchant yet), added edit screen
Merge branch 'master' of https://github.com/agustaf9/kff