CMakelists and travis fixed
Merge branch 'master' of https://github.com/davidsanfal/tinyxml2

Conflicts:
	.travis.yml