Update documentation
Merge pull request #344 from grosenbaum/update-documentation

Update documentation
Merge remote-tracking branch 'sonata-project/master'