simplified installation documentation
synchronized ExceptionController::getAndCleanOutputBuffering() with the latest version from Symfony
synchronized ExceptionController::findTemplate() with the latest version from Symfony
added a note about methods that should be synchronized with the code in TwigBundle
Merge pull request #533 from fabpot/exception-controller-sync

Exception controller sync with TwigBundle
Merge pull request #532 from fabpot/doc-setup

simplified installation documentation
Fix for issue #534 - Doctrine AnnotationException on @note
Merge pull request #535 from DanielleSuurlant/master

Fix for issue #534 - Doctrine AnnotationException on note
fixed undefined variable
Merge pull request #537 from fabpot/exception-controller-sync

fixed undefined variable
fixes for issues introduced in #533
yet another attempt to fix #533
Merge branch 'FOS-master/master'