Changed version number
Fixed composer json
Merge branch 'master' into 1.0

Conflicts:
	composer.json
Fixed composer json
Make bundle compatible with Symfony 2.4