updated version to 2.6
bumping SensioDistributionBundle dep
bumping Symfony to 2.5 stable
fixed symfony deps
Merge branch 'symfony-2.5' into 2.5
Merge branch 'symfony-master'

Conflicts:
	composer.json
Fixed web/app_dev.php
Merge branch '2.5'