Merge branch 'master' of https://github.com/Bernadskaya/AntBundle

Conflicts:
Entity/Image.php
y
j