Remove .travis.yml file from main directory
Merge branch 'master' into menubar

Conflicts:
	.travis.yml