fix bug when entering annotation
Merge branch 'html' of github.com:nbproject/nbproject into html
- fix settings page
- remove inserting jquery by default on the base template.