Merge remote-tracking branch 'origin/master' into michi
added languages for code snipets
Merge remote-tracking branch 'origin/michi'