.gitignore added
Merge commit '51ae8c924dba9abfd04f017238bd57d47fd4652d'
Added .gitignore back in master from jb-4.2.2