Updated dependencies
Merge branch 'refs/heads/Released/beta2' into release

Conflicts:
	composer.json
Merge branch 'refs/heads/release'
Reverting back to dev- dependencies