Allow Symfony 2.5 and symfony-cmf 1.2
Update Travis to test against current dev branches and added symfony 2.5
Use correct badge in README for branch 1.0
Merge branch '1.0'

* 1.0:
  Use correct badge in README for branch 1.0
  Allow Symfony 2.5 and symfony-cmf 1.2 Update Travis to test against current dev branches and added symfony 2.5

Conflicts:
	CHANGELOG.md