removed separate settings page from docs
Merge branch 'release_1.0' of github.com:jeinarsson/josync into release_1.0
Merge branch 'release_1.0' into develop