Merge branch 'releases/2.1.0'

Prepping for 2.1.0 release
Bumped version

- reflects development status
Merge branch 'version/bump'
Fix branch-alias for composer

- dev-master is now 2.1-dev, dev-develop is now 2.2-dev
Merge branch 'hotfix/composer-alias' into develop

Conflicts:
	README.md
	library/Zend/Version/Version.php