Code Cleanup

- updated deprecated calls
- cleaned up PHPDoc comments

this change might be put in a new branch, because IT IS NOT COMPATIBLE WITH SYMFONY 2.1