Setting up everything to work both on mysql and postgress.
Merge remote-tracking branch 'origin/master'