Updated documentation
Merge pull request #295 from Bladrak/doc

Updated documentation
Merge branch 'sonata-project/master'