import function
testing branching and merging
Merge branch 'resource-importer'

Conflicts:
	.gitignore