Merge branch 'release/v1.0.1'

* release/v1.0.1:
  Updated README
Merge branch 'master' of github.com:braincrafted/bootstrap-bundle

* 'master' of github.com:braincrafted/bootstrap-bundle:
Merge branch 'release/v1.0.2'

* release/v1.0.2:
  Bump version
  Added Travis status images to README.md
Update composer.json

Fixed typo.
Add validation style
Replace form_row by block() to retieve data
Using assets twig function for including css and js

Fixes using bundle in a non-root web directory
Add the .inline class to a series of radios
Current version of Bootstrap and jQuery
Merge pull request #4 from userfriendly/patch-1

Update composer.json
Merge pull request #5 from Develle/master

Add validation style
Merge pull request #7 from liberologico/hotfix-assets

Using assets twig function for including css and js
Merge pull request #15 from darsadow/bootstrap-2.3.0

Current version of Bootstrap and jQuery

# By Dariusz Sadowski
# Via Dariusz Sadowski
* darsadow/bootstrap-2.3.0:
  Current version of Bootstrap and jQuery
Merge branch 'master' of github.com:braincrafted/bootstrap-bundle

* 'master' of github.com:braincrafted/bootstrap-bundle:
  Add the .inline class to a series of radios
  Using assets twig function for including css and js
  Replace form_row by block() to retieve data
  Add validation style
  Update composer.json

Conflicts:
	Resources/views/_javascripts.html.twig
Merge branch 'release/v2.3.0'

* release/v2.3.0:
  Updated composer
  Updated composer and travis config files
  Added support for icons in menus
  Added label filters
  Added label filters
  Added pager style and configurable labels
  Suggest KnpMenuBundle instead of requiring it.
  Added pagination styles
messed up version
Merge branch 'hotfix/v1.1' into develop

* hotfix/v1.1:
  messed up version
  Current version of Bootstrap and jQuery
  Add the .inline class to a series of radios
  Using assets twig function for including css and js
  Replace form_row by block() to retieve data
  Add validation style
  Update composer.json