Conflicts:
backend/components/parsers/CustomCsvParser.php
backend/components/parsers/config.php
backend/config/main.php
backend/controllers/CheckPriceController.php
backend/controllers/ParserController.php
backend/views/layouts/column.php
backend/views/parser/index.php
backend/views/parser/server-files.php
backend/web/css/plugins/daterangepicker/daterangepicker-bs3.css
backend/web/css/plugins/daterangepicker/daterangepicker.js
backend/web/css/plugins/daterangepicker/moment.js
backend/web/css/plugins/daterangepicker/moment.min.js
console/config/main.php
console/migrations/m150925_111922_add_foreign_key_ImportFiles.php
framework/core/Convert.php
framework/lang/da.yml
framework/lang/fr.yml
framework/lang/nb.yml
vendor/yiisoft/multiparser/Converter.php
vendor/yiisoft/multiparser/CsvParser.php
vendor/yiisoft/multiparser/YiiMultiparser.php
