Maven Update & WIP Testing
Merge branch 'master' into dev