Merge remote-tracking branch 'origin/sprint1' into sprint1

Conflicts:
	.travis.yml