Merge branch 'master' into patch-1

* master: (24 commits)
  Add ignore for npm debug log files
  Add KiCad ignore for .bck and .kicad_pcb-bak
  Correct capitalisation of LightSwitch and omit generated.parameters.xml
  Add newline at EOF
  Add ignores for Visual Studio Lightswitch build output
  Adding optional ignore proposal for wwwroot folder
  Ignore NCrunch temporary files.
  Update Dart.gitignore
  Added .stack-work/ directory to Haskell .gitignore.
  add Android Studio to the covers list
  Ignore Default RSpec State File
  Ignore *.auxlock files created by TikZ in TeX
  Ignore files created by `\tikzexternalize`
  Update Typo3.gitignore for CMS v6.2
  [ObjC][Swift] Ignore Xcode SCM blueprint files
  include preamble files generated by mylatexformat package
  Add .jar, .exe and .msi
  Remove .SRCINFO (and old .AURINFO) from .gitignore
  Add CMakeScripts directory
  ignore OAuth2 token
  ...

Conflicts:
	Objective-C.gitignore
	Swift.gitignore

diff --cc Global/Xcode.gitignore
index c08bace2b26fc116142e82a5a628967646e3729f,d07b7894f1bf8add4b6c024c5021086397536d03..37de8bb4793f174d4cb4dab98b2ead9020b86d21
--- 1/Global/Xcode.gitignore
--- 2/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@@ -15,8 -15,9 +15,9 @@@ DerivedData
  !default.mode2v3
  *.perspectivev3
  !default.perspectivev3
 -xcuserdata
 +xcuserdata/
  
  ## Other
--*.xccheckout
  *.moved-aside
 -*.xcuserstate
++*.xccheckout
++*.xcscmblueprint

diff --cc Objective-C.gitignore
index 59f6862a9d21c996a8dd0b40124ca11e0fac422f,05096f66ef27231dfc127a4564b80f06bcf919c9..2f65d4cd860af30bc6653d78a9a8dde39010fa3a
--- 1/Objective-C.gitignore
--- 2/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@@ -15,11 -15,13 +15,12 @@@ DerivedData
  !default.mode2v3
  *.perspectivev3
  !default.perspectivev3
 -xcuserdata
 +xcuserdata/
  
  ## Other
--*.xccheckout
  *.moved-aside
 -*.xcuserstate
++*.xccheckout
+ *.xcscmblueprint
  
  ## Obj-C/Swift specific
  *.hmap

diff --cc Swift.gitignore
index e278bf19ab5d4acb2d1b4e16d933b32fa1080651,d571cb2c8d0278a3b8866003a89fc22038b733b7..64daed58f98a3b9b9142e5a0d7a9caeac5437efd
--- 1/Swift.gitignore
--- 2/Swift.gitignore
+++ b/Swift.gitignore
@@@ -15,11 -15,13 +15,12 @@@ DerivedData
  !default.mode2v3
  *.perspectivev3
  !default.perspectivev3
 -xcuserdata
 +xcuserdata/
  
  ## Other
--*.xccheckout
  *.moved-aside
 -*.xcuserstate
++*.xccheckout
+ *.xcscmblueprint
  
  ## Obj-C/Swift specific
  *.hmap