Merge branch 'refs/heads/ignore-duplicates' into new-master

* refs/heads/ignore-duplicates:
  [~BUGFIX] Cleaned up the merge
  Added the ability to ignore duplicates, it just skips them without throwing an error, makes the importer a bit more forgiving.
Merge branch 'refs/heads/file-renames' into new-master

* refs/heads/file-renames:
  allowFileRenames implemented
Merge branch 'refs/heads/fast-import' into new-master

* refs/heads/fast-import:
  [~FEAT] Faster select statement for the entity_ids
  fast indexing implemented
Merge branch 'refs/heads/category-index' into new-master

* refs/heads/category-index:
  [+BUFGIX] Table names loaded instead of hardcoded.
  Category update children count after importing.