AID-40 Added files from local repository.
AID-40 Resolved conflict in .gitignore