fix bug when entering annotation
Merge branch 'html' of github.com:nbproject/nbproject into html