alias dev-master to 2.0.x-dev composer version
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json