Merge branch 'hotfix/1391411340'
Edit .travis.yml
Merge branch 'hotfix/1391412406-travis' into develop