Maven stuff
Merge branch 'develop' of github.com:grisu/grisu into develop