Merge branch 'master' into 2.3
Merge branch 'refs/heads/master' into 2.3
corrected the travis badge
Merge branch 'refs/heads/master' into 2.3
Merge branch 'refs/heads/master' into 2.3
update the composer file to use more stable versions of bundles where possible
reintroduce the knplabs/knp-paginator-bundle
Bug Fix
Merge branch '2.3' of git://github.com/networking/init-cms-bundle
Merge branch 'master' of git://github.com/networking/init-cms-bundle

Conflicts:
	composer.json