update travis [ci skip]

Conflicts:

	.travis.yml
support for ie10 [ci skip]
Merge branch 'back_to_prototype' into wip