merged release to master
more doc additions
fixed conflicts of develop merge into master