Added License Information (OSL v3)
Merge branch 'master' of github.com:avstudnitz/AvS_FastSimpleImport

Conflicts:
	src/app/code/community/AvS/FastSimpleImport/Model/Import.php