merge github/7.x-1.x
fix gitignore
Merge remote-tracking branch 'github/7.x-1.x' into dev
Merge remote-tracking branch 'github/7.x-1.x' into dev
Merge branch 'dev' into 7.x-1.x