Fix for issue #120 and #220. Only for master branch (Wicket 6 required)

This fix takes advantage of the HeaderItem abstraction introduced with ver. 6.x