fixed version in composer.json
updated version to 2.6
Merge branch 'symfony-standard'
Merge branch 'master' into MopaBootstrapBundle

Conflicts:
	composer.json