test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/_HardCore.iml
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
	vendor/composer/installed.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
Merge remote-tracking branch 'origin/master'
create,update,delate
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/frontend/techonline/CatalogBaseController.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
	app/controllers/frontend/techonline/CatalogBaseController.php
	vendor/autoload.php
	vendor/composer/autoload_real.php
Merge remote-tracking branch 'origin/master'
create,update,delate
Merge remote-tracking branch 'origin/master'