fix syntax error
Merge branch 'html'
Merge branch 'master' of https://github.com/nbproject/nbproject