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

Conflicts:
	.gitignore
[IMP] - fix conflicts
[FIX] - update the .gitignore file
[MRG] merge with branch 7.0
Merge branch '7.0'

Conflicts:
	.gitingnore