Changed text and fixed links
Text changes
Merge branch 'release/jonathan-1.1' into gh-pages