added travis yml
Merge branch 'travis' into develop

* travis:
  added travis yml

Conflicts:
	.travis.yml
	config/database.yml