Fix bzr problem
Change order of html docs generation
Merge branch 'release/0.7.0'