revert commit fail
huge commit due to line breaks
revert commit fail
revert commit fail
fix versions on master
merged
fix poms
re-add release-plugin
resolve conflicts
fix xml
Merge pull request #17 from ridoo/master

merge