fixed travis
Merge remote-tracking branch 'origin/developement' into developement

Conflicts:
	.travis.yml
	config/database.yml