move database stuff
backup script & gitignore update
change to productive DB
add mailsettings to gitignore
manual merge