Implemented fix for files with same name, some clean up in mmapi.inc
Merge pull request #5 from bellcom/b/JFE-548-37019_re-import-problems

Implemented fix for files with same name, some clean up in mmapi.inc