Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	samples/browser/src/TerrainSample.cpp

samples/browser/sample-browser.xcodeproj/project.pbxproj

@@ -693,6 +693,7 @@
 		5B61612A14CCC24C0073B857 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -729,6 +730,7 @@
 		5B61612B14CCC24C0073B857 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";

samples/character/res/common/scene.material

@@ -27,7 +27,7 @@ material texturedUnlit
     }
 }
 
-material textured
+material texturedSpecular
 {
     technique
     {
@@ -35,7 +35,7 @@ material textured
         {
             vertexShader = res/shaders/textured.vert
             fragmentShader = res/shaders/textured.frag
-			defines = DIRECTIONAL_LIGHT_COUNT 1
+			defines = SPECULAR;DIRECTIONAL_LIGHT_COUNT 1
 
             u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
             u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX
@@ -284,7 +284,7 @@ material lightblue : colored
     }
 }
 
-material basketball : textured
+material basketball : texturedSpecular
 {
     technique
     {