[FIX] - update the .gitignore file
[MRG] merge with branch 7.0
Merge branch '7.0'

Conflicts:
	.gitingnore