Merge branch 'develop'
Fixed docs
Merge branch 'master' into filepicker