On branch master
  Changes to be committed:
 	modified:   app/AppKernel.php
 	modified:   app/config/security.yml
 	modified:   src/Aleph2Omega/EducationBundle/Entity/User.php
 	modified:   src/Aleph2Omega/EducationBundle/Resources/views/Default/index.html.twig
 	modified:   src/Aleph2Omega/TranscriptionBundle/Entity/Text.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Form/Type/EditTextType.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Resources/config/doctrine/Text.orm.yml
 	modified:   web/app_dev.php