Importer changes
Merge branch 'master' of https://github.com/shukkydomes/activecode_property

Conflicts:
	db/schema.rb