Source directory fixed to src/ instead of standard Maven hierarchy
Merge remote-tracking branch 'origin/master'