a
Merge remote branch 'origin/feature-Mvn_and_CI' into feature-Mvn_and_CI

Conflicts:
	.travis.yml