updated documentation in framework
Merge branch 'dev' into documentation