Incorporate changes from online editor.
Update front page.
Merge branch 'development'