Combined OrderItem and Subscription models
merged controllers from catelogController.js and identityController.js into app.js.
moved some functionality from identityController to identityService
Merge remote-tracking branch 'origin/master' into gh-pages