add dev alias
add workspace to ignore
Merge branch 'master' of github.com:pscheit/psc-cms-client

Conflicts:
	.gitignore
	composer.json