Fixed Maven related issues
Merge branch 'master' of https://github.com/skunkiferous/XTendTraitsAndMore