Prepare for merge
classpath
Merge branch 'master' of https://github.com/krzychusan/presta-custom-import