fixed conflict
Merge branch 'master' into biovel-config

Conflicts:
	config/initializers/seek_configuration.rb