CMS v1
Merge pull request #2 from amsterdamhackathon/henry

CMS v1
Refactoring v1
Merge pull request #3 from amsterdamhackathon/henry

Refactoring v1
Merge branch 'master' into watterna