Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	.gitignore

src/.vscode/launch.json

@@ -1,12 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug",
-            "type": "gdb",
-            "request": "launch",
-            "target": "./bin/executable",
-            "cwd": "${workspaceRoot}"
-        }
-    ]
-}