Upgrading Wicket and assembly plugin
Merge branch '1_2_X'