Fixed annotations
Merge branch 'master' of https://github.com/r-h/wicket-notes-demo.git