updated documentation
reorganized settings
Merge branch 'dev' into fullbinaries