Changed branch aliases
Merge branch 'master' of local repository into 1.0.x

Conflicts:
	composer.json