bootstrap 3 update
Merge branch 'master' of git://github.com/kristofvc/ListBundle

* 'master' of git://github.com/kristofvc/ListBundle:
  Update composer.json