Small changes
Merge remote-tracking branch 'origin/master'
Change db user
Change login and pass constant
Fix merge bugs