more changes
MOre changes
Merge branch 'master' into Jasmine2.0

Conflicts:
	.travis.yml