Another attempt with travis, pro and makefile updates
Merge branch 'dev-openalbackend' into dev

Conflicts:
	.travis.yml