Altered travis' database.yml
Merge branch 'feature/test' into dev
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev