merging cma_friendly and updating docs
upgrading version to 2.7.0 and re-building documentation