Add bundle configs for YCM
Update settings
Update
Merge commit '0bb15c62bc950a5905c04724004e83b23e522d48' into develop

* commit '0bb15c62bc950a5905c04724004e83b23e522d48':
  Add bundle configs for YCM
Merge commit '180b17d60bfa1d84fa6b26403a5b66d3b0e12541' into develop

* commit '180b17d60bfa1d84fa6b26403a5b66d3b0e12541':
  Update
  Update settings