update docs
Merge branch 'sookee' into katina-dev-0.1-beta