Merge pull request #2 from gitblit/master

merge updates from gitblit master into this wicket-7 branch