Update travis
Merge branch 'master' of https://github.com/Grafikdev/jQuery-Ajax-Loading

Conflicts:
	.travis.yml