Merge pull request #142 from jerv13/master

Update for page types and Api JSON model
Merge remote-tracking branch 'upstream/master'