Upgraded Symfony to 2.6 version
Merge branch 'develop'

Conflicts:
	composer.lock