Modified .gitignore to ignore iml and idea files - [Bala]
Functionality to resolve cyclic dependencies in objects while masking - [Bala]