Changes in pom

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Fixed merge con flict in UserDaoMap

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>