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

Fix for issue #534 - Doctrine AnnotationException on note