Merge tag '2.1' into develop

Version 2.1
Raise the branch alias version.
Merge branch 'master' into develop

Conflicts:
	composer.json
Initialize components installation directory.
Merge branch 'release/2.2'