Corrected import function code
Merge branch 'develop'

Conflicts:
	stylesheet.less