remove app cache, logs .gitkeep to ignore file
updated VENDORS for 2.2.2
updated VENDORS for 2.2.3
Small typo/grammar fix.
merged branch DanielleSuurlant/master (PR #568)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #568).

Discussion
----------

Small typo/grammar fix in web/.htaccess

Commits
-------

a7f40f2 Small typo/grammar fix.
updated VENDORS for 2.2.4
updated VENDORS for 2.3.2
Updated the profiler configuration for the 2.3 changes
merged branch mcg-web/patch-1 (PR #513)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #513).

Discussion
----------

remove app cache, logs .gitkeep to ignore file

Commits
-------

0523a9e remove app cache, logs .gitkeep to ignore file
merged branch stof/patch-3 (PR #573)

This PR was merged into the 2.3 branch.

Discussion
----------

Updated the profiler configuration for the 2.3 changes

FrameworkBundle 2.3 changed the way to configure the profiler, and keeping the old configuration does not allow using ``$client->enableProfiler()`` in tests.

This is related to https://github.com/symfony/symfony/issues/8541

Commits
-------

16adebe Updated the profiler configuration for the 2.3 changes
Update phpDoc to make it standard compliant

PHP Doc stipulates that for `@var` comments, the type should come first (see http://en.wikipedia.org/wiki/PHPDoc#Tags)
merged branch fzaninotto/patch-1 (PR #571)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #571).

Discussion
----------

Update phpDoc to make it standard compliant

PHP Doc stipulates that for `@var` comments, the type should come first (see http://en.wikipedia.org/wiki/PHPDoc#Tags)

Commits
-------

5895afb Update phpDoc to make it standard compliant
updated demo code to use the non-deprecated features of Twig
updated VENDORS for 2.2.5
updated VENDORS for 2.3.3
merged branch fabpot/twig-deprecated-features (PR #580)

This PR was merged into the 2.2 branch.

Discussion
----------

Twig deprecated features

see symfony/symfony#8675

Commits
-------

35a5826 updated demo code to use the non-deprecated features of Twig
updated VENDORS for 2.2.6
updated VENDORS for 2.3.4
fix doctrine-common dependency for 2.3 version
merged branch eventhorizonpl/fix_doctrine_common_dependency (PR #591)

This PR was merged into the 2.3 branch.

Discussion
----------

Fix doctrine common dependency

After release of Doctrine 2.4 the following versions was installed:
doctrine-orm: 2.3.x
doctrine-dbal: 2.3.x
doctrine-common: 2.4.x

We want the same version of doctrine components. I suggest blocking it on 2.3 for now.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

df4a16e fix doctrine-common dependency for 2.3 version