updated VENDORS for 2.1.10
updated doc links
merged branch lsmith77/patch-2 (PR #551)

This PR was merged into the 2.2 branch.

Discussion
----------

updated doc links

Commits
-------

465686c updated doc links
Remove +x mode on file
merged branch jdespatis/master (PR #545)

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

Discussion
----------

Remove +x mode on file app/logs/.gitkeep

Mode on app/cache/.gitkeep is 100644, same mode should be applied to app/logs/.gitkeep

Further more, afaik, .gitkeep doesn't aim to be a shell script

Commits
-------

89a18a4 Remove +x mode on file
Merge branch '2.1' into 2.2

* 2.1:
  Remove +x mode on file
  updated VENDORS for 2.1.10

Conflicts:
	composer.lock
updated VENDORS for 2.2.2
Updated documentation files
Renamed composer package
Updated PHP minimum version to 5.3.17
Intercepted redirection in dev environment
Removed AcmeDemoBundle
Removed configuration check
Used empty (blank) favicons
Updated README for removed dependencies
[2.2] Used parameters.yml.dist
Fixed update to 2.2.2