Docs update
Merge branch 'gh-pages' of https://github.com/Adyax/docman into gh-pages