Fix to XmlMergeTest.testComplete2Sources() to ensure it passes on Windows
Merge pull request #150 from unb/master

Fix to XmlMergeTest.testComplete2Sources() to ensure it passes on Windows
Fix to get UserInputPanelTest.testSearch() working again
Merge pull request #151 from unb/master

Fix to get UserInputPanelTest.testSearch() working again
Merge branch 'master' of https://github.com/izpack/izpack into develop