fix tests and update devise
update travis [ci skip]

Conflicts:

	.travis.yml