Updated version to 2.6
Merge branch 'master' into develop
Merge branch 'develop' into feature/homework_2

Conflicts:
	composer.lock