added travis-ci config
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.travis.yml