The basics for templates
bringing in sync with master
bringing in sync with master
Api is broken
Merge pull request #45 from MomentumCMS/feature/api

Feature/api