Maven build
Merge branch 'master' of github.com:kthoms/sadl-os