v.2-rc1 Updated documentation.
Merge branch 'dev-2.0' into cake2.0