refactor for maven
Merge branch 'master' of ssh://github.com/guycole/WxTrax2

Conflicts:
	wxtrax2-app/pom.xml
pom conflict
more pom magic