Delete JSON dependency from pom and added password field to user
Merge branch 'master' of https://github.com/ALIADA/aliada-tool