Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	.gitignore