updated
Merge branch 'feature/pages' of https://github.com/jonniespratley/angular-cms into feature/pages