Pages init
Merged devel branch
Fixed merge
Merge branch 'develop' into gh-pages