Merge branch 'develop'
if page statements
Merge branch 'master' into develop