Revised twitter bootstrap repo
Merge pull request #75 from skuark/master

Revised twitter bootstrap repo
Merge branch 'master' of https://github.com/braincrafted/bootstrap-bundle into 2.0

* 'master' of https://github.com/braincrafted/bootstrap-bundle:
  Revised twitter bootstrap repo

Conflicts:
	DependencyInjection/Configuration.php
Updated to jQuery 1.10.2
Merge branch '2.0' of github.com:braincrafted/bootstrap-bundle into 2.0

* '2.0' of github.com:braincrafted/bootstrap-bundle:
  Updating pagination to Bootstrap 3.0
  Update flash.html.twig
  Update form_div_layout.html.twig
  Update form_div_layout.html.twig
  Update form_div_layout.html.twig
  Added style to prototype in collection. Fixes #97