refactored to use coordinate structs
Merge branch 'master' of github.com:rurabe/wicket