updated dependencies
implemented new productBaseBundle
added product bundles
updated composer
Merge branch 'master' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.json
	composer.lock
updated dependencies
updated dependencies
updated dependencies
merged conflicts
Merge pull request #49 from sulu-cmf/feature/import-dummy

implemented new productBaseBundle
updated dependencies
Merge branch 'master' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.lock
added phpcr workspace config & parameter
Merge branch 'master' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.lock
updated dependencies
refactored workspace 2 webspace
updated travis config
updated travis config
Merge pull request #52 from sulu-cmf/feature/workspace-2-webspace

Feature/workspace 2 webspace
updated dependencies