merged database.properties
updated pom plugins