.git ignore update
Merge remote-tracking branch 'bitbucket/master' into branch1