base
Merge branch 'master' of https://github.com/lzdv/ecommerce

Conflicts:
	composer.json
travis