Merge branch 'develop' into feature-tests
[kamaki] / docs / _static
2012-11-22 Stavros SachtourisFix some docs errors