Changed types as they where re-declared in the implementation anyway and created a compiler error.
Changes due to auto-formatting from my IDE
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added call to glfwDefaultWindowHints(), see code-comment for details.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into cmake_generalization