fixed paths
removed docs
Merge branch 'develop'