fix stupid travis.yml formatting error
add html format for travis-ci notification
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	.travis.yml