merging changes after maven module restructuring #116

Closed janpolowinski closed 9 years ago