Updated wicket, spring, wiquery