Allow Doctrine 2.4 to be installed
Change del of .htaccess to be file, not dir
minor #612 Allow Doctrine 2.4 to be installed (jdespatis)

This PR was merged into the 2.3 branch.

Discussion
----------

Allow Doctrine 2.4 to be installed

The commit https://github.com/symfony/symfony-standard/commit/0cafa504b6d1235c901d127da01c996219341e6c#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780, lets Doctrine 2.4 installable

But it has been performed only on `master`, `2.4`

Any reason why it shouldn't also be backported to last stable version of `symfony-standard` (`2.3`) ?

Commits
-------

42937c1 Allow Doctrine 2.4 to be installed
tweaked README
Removed AcmeDemoBundle path from security config.
Added back JMS DiExtra and SecurityExtra bundles.

This reverts the change to AppKernel from commit e5a819f9596a0e070e217f0c7872362fd926584d that brought in 2.3.
Added jms_security_extra.expressions:false config.

See http://jmsyst.com/bundles/JMSSecurityExtraBundle/master/configuration
Merge pull request #43 from mattjanssen/2.3

Added JMS bundles back to AppKernel and config.yml
Merge tag 'v2.3.12' of github.com:symfony/symfony-standard into 2.3

created tag 2.3.12

Signed-off-by: Maxwell Vandervelde <mvanderv@nerdery.com>

Conflicts:
	README.md
Merge pull request #38 from ReservedDeveloper/hotfix/buildFileHtaccessFix

Change del of .htaccess to be file, not dir
Fix typos in build file
Update build.xml
Merge tag 'v2.3.17' of github.com:symfony/symfony-standard into 2.3

Conflicts:
	README.md
Added composer.json required-dev section with 8 new code quality packages
Reimplemented phploc to use phing task, changed report type from CSV to TXT
Reimplemented phpdoc task to use phpdocumentor2
Updated check:cs task to output full text codesniffer report
Updated check:cs task to output full text codesniffer report
Updated check:md task to also use design and naming rulesets
Updated check:depend task to also generate summary-xml and phpunit-xml reports