Completed version of es_shop_app -- includes completed views, models and controllers