Mavenize project and upgrade tests to junit 4.11
Merge pull request #1 from sotty/master

Mavenize project and upgrade tests to junit 4.11