Really fix .gitignore
Add wrongly labeled "debug" files.
Merge remote-tracking branch 'origin/Dev1' into Dev2