...
Merge branch 'origin/develop'

Conflicts:
	.travis.yml
...