Fixed overall documentation (text and html)
Merge branch 'devel'