refactor
Merge branch 'master' of github.com:ghostika/plastic

Conflicts:
	src/Plastic/ProfileBundle/Manager/ImageManager.php
#312