Merge branch 'development' Updated pom dependencies, ServerProperties reads environment variables
for DB_USER and DB_PASSWORD.
added .settings