modified:   src/Aleph2Omega/EducationBundle/Entity/User.php
 	new file:   src/Aleph2Omega/EducationBundle/Entity/User.php~
 	modified:   src/Aleph2Omega/TranscriptionBundle/Controller/DefaultController.php
 	new file:   src/Aleph2Omega/TranscriptionBundle/Controller/ImageFormController.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Controller/TextFormController.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Controller/WordFormController.php
 	new file:   src/Aleph2Omega/TranscriptionBundle/Entity/Image.php
 	new file:   src/Aleph2Omega/TranscriptionBundle/Entity/Image.php~
 	modified:   src/Aleph2Omega/TranscriptionBundle/Entity/Text.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Entity/Text.php~
 	modified:   src/Aleph2Omega/TranscriptionBundle/Entity/Word.php~
 	new file:   src/Aleph2Omega/TranscriptionBundle/Form/Type/EditImageType.php
 	modified:   src/Aleph2Omega/TranscriptionBundle/Form/Type/EditTextType.php
 	new file:   src/Aleph2Omega/TranscriptionBundle/Resources/config/doctrine/Image.orm.yml
 	modified:   src/Aleph2Omega/TranscriptionBundle/Resources/config/doctrine/Text.orm.yml
 	modified:   src/Aleph2Omega/TranscriptionBundle/Resources/config/routing.yml
 	modified:   src/Aleph2Omega/TranscriptionBundle/Resources/config/validation.yml
 	new file:   src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/images.html.twig
 	modified:   src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/texts.html.twig
 	renamed:    src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/edit_text.html.twig -> src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/texts_edit.html.twig
 	renamed:    src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/text_view.html.twig -> src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/texts_view.html.twig
 	renamed:    src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/edit_word.html.twig -> src/Aleph2Omega/TranscriptionBundle/Resources/views/Default/words_edit.html.twig
 	new file:   web/check.php
 	new file:   web/php.ini