import person.person_organisation
Merge branch 'master' of github.com:bisscraper/bisscraper

Conflicts:
	app/models/sn/base.rb