Merge branch 'v2-html' into inline_html_resources

Author: bukzor

.travis.yml

@@ -4,4 +4,4 @@ compiler:
 script: make
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq gcc-4.6-plugin-dev python-six python-pygments graphviz
+ - sudo apt-get install -qq gcc-4.6-plugin-dev python-six python-pygments graphviz python-lxml