updated doctrine orm/dbal/common
Merge remote branch 'lsmith77/doctrine_updates'

* lsmith77/doctrine_updates:
  updated doctrine orm/dbal/common
Merge remote branch 'brikou/indentation_fix'

* brikou/indentation_fix:
  fixed (or tweak) indentation in parameters.ini + changed default csrf token by an explicit one
  fixed indentation in phpunit configuration file
switched Twig to use the upcoming 1.1 version (as error messages are much better as everything is BC)
updated VERSION
changed all vendor URLs to HTTP instead of HTTPS
updated VERSION
Adding check for json extension into the config.php script. This fixes trac ticket #9635
Added a check for json extension
Add firephp log output by default in dev config
Merge remote branch 'mvrhov/trac_9635_fix'

* mvrhov/trac_9635_fix:
  Added a check for json extension
  Adding check for json extension into the config.php script. This fixes trac ticket #9635
merged Seldaek/https
Merge remote branch 'Seldaek/monolog_firephp'

* Seldaek/monolog_firephp:
  Add firephp log output by default in dev config
use Assetic alpha2
simplified default configuration
updated Doctrine configuration
fixed typo
updated secret management
updated README
tweaked front controllers to enable PHP class caches