updated for new docu structure
Merge remote-tracking branch 'origin/master'
small styling fixes