Resolved conflicts and updated gaufrette version to min 0.1.7