Merge branch 'develop'
Function names changed / Custom fields for subpages
Merge branch 'master' into develop