Merge pull request php-debugbar#196 from hieblmedia/patch-1

Show the real parameter name for prepared queries.

Update jQuery to 1.11.2

Merge pull request php-debugbar#186 from arnaudroulee/master

Fix IE resize

Merge pull request php-debugbar#182 from alprs/feature/disable-vendor…

…-asset

Allow disabling of specific vendor assets

Update changelog

Probably not all, but better then nothing ;)

Merge pull request php-debugbar#150 from discordier/fix-sql-params

Ensure only parameters are added to SQL widget and no prototype functions.

Merge remote-tracking branch 'origin/pr/109'

Conflicts:
	src/DebugBar/Resources/widgets/sqlqueries/widget.css

Merge pull request php-debugbar#117 from geekwright/sqlwrap

Add wrap to SQL code block  to make queries fully visible

Merge pull request php-debugbar#111 from barryvdh/patch-6

Add title to variable keys

avoid triggering error if hljs is not loaded (fixed php-debugbar#107)