Added to .gitignore: PHPStorm folder, backup files from Unix editors and merge files
Updated CHANGELOG.md: Rebased with symfony-standard v.2.3.3
Commented out AcmeDemoBundle configuration from AppKernel & routing_dev.yml