Merge branch 'release-1.0' into develop
updated the release_version
Tidy up display and fixed layout
Merge branch 'release-1.1'