testing new github release configuration
testing new github release configuration
Merge origin/master

Conflicts:
	.travis.yml