Prepare main development page
Merge remote-tracking branch 'origin/feature' into gh-pages