changed version in pom.xml
Merge branch 'master' of https://github.com/mibto/mez into develop
Merge branch 'develop' of https://github.com/mibto/mez into develop
merge TimeEntryController