Cleaned up and fixed the pom.xml files.
Merge commit 'c4d2aeb67df31a889ea68c622f9cb2c5997f9cd9'
Merge pull request #38 from green-coder/master

Pom.xml clean up & fix