Maven changes
Merge branch 'master' of github.com:buren/test into feature3

Merge.
Merge pull request #15 from buren/feature3

Feature3