3.0.0-alpha

3.0.0-alpha

2.0.0: Merge branch 'master' into github

# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	README.md
#	common/components/SettingsComponent.php
#	composer.json
#	console/config/bootstrap.php
#	console/config/main.php
#	frontend/config/main.php
#	frontend/templates/default/modules/cms/content-element/product.php

1.0.0

Update CHANGELOG.md