Finalize SiteController and CartController
Merge branch 'master' of https://github.com/medo/elmasla7a