[FIX] - change gitignore file name
[IMP] merge .gitignore file
Merge branch '7.0'

Conflicts:
	.gitignore
[IMP] - fix conflicts