Merge from master stuff

common/glm/glm/detail/dummy.cpp

@@ -41,7 +41,7 @@ struct material
 	glm::vec4 diffuse; // Dcm
 	glm::vec4 specular; // Scm
 	float shininess; // Srm
-};
+};
 struct light
 {
 	glm::vec4 ambient; // Acli
@@ -58,7 +58,7 @@ struct light
 	float constantAttenuation; // K0
 	float linearAttenuation; // K1
 	float quadraticAttenuation;// K2
-};
+};
 
 // Sample 1
 #include <glm/vec3.hpp>// glm::vec3