...
Merge remote-tracking branch 'origin/develop'
Fixed DB name in travis CI