Minor fix for unit test (dependency on Wicket)
Minor fix for template files due to Wicket upgrades
Merge pull request #3 from FuadEfendi/16x

16x