Merge pull request #58 from jangahroo/master

Integrated changes for 9-5-2014
(refactor) updated movies and events services to use custom map markers
(feat) added edit cart view