Wicket version to 1.5.7, merged Hyperion Tools into codebase
Updates and cleanups
Dependency updates, untested, probably won't compile