Converted to Maven 3 project
Merge remote-tracking branch 'origin/master'