database.properties into master branch
manually pulled changes into master