Merge pull request #3 from gitblit/master

Get latest stuff from master before move forward with wicket-7