Added source file groups in CMake files (for better organization of sources when opening SFML projects in IDEs)
added support to set int param in shader as well as checks to remove unnecessarily setting shader program
Merge remote-tracking branch 'upstream/master'