Added .gitignore
Merge branch 'master' into feature/CFY-1155-operation-mapping

Conflicts:
	.gitignore
CFY-1155 fixed yaml files