Merge remote-tracking branch 'refs/remotes/origin/master' into gui

.gitignore

@@ -11,7 +11,6 @@ plugins/lib/*
 package/*
 
 # Example files
->>>>>>> master
 examples/bin/*.exe
 examples/bin/*.pdb
 examples/bin/*.dll
@@ -36,6 +35,7 @@ build/scripts/features/index.html
 doc
 
 # Codeblocks
+*.save-failed
 build/**/*.cbp
 build/**/*.cbp
 build/**/*.cbTemp
@@ -47,6 +47,9 @@ build/**/*.workspace
 # CodeLite
 build/**/*.project
 
+# GMake
+build/**/*.make
+
 # Visual Studio
 build/**/*.pdb
 build/**/*.filters