Merge branch 'develop'
Merge branch 'develop'
Give the project its own artifactId
Increase encrypted pincode field maximum size