Fixed compile errors (by commenting out some problems in a new test file)
Reverse the eclipse maven plugin support pom changes as they ended up breakingrunning maven from the console...
had to commit after a pull...
Merge branch 'develop'