fix tests and update devise
update travis [ci skip]

Conflicts:

	.travis.yml
refactoring of bulk import
Merge branch 'back_to_prototype'

Conflicts:
	Gemfile.lock