Use of a factory for control instantiation
Merge branch 'next' of git://github.com/blackberry/GamePlay into controls_factory

Conflicts:
	gameplay/src/ImageControl.cpp
Support for multiple lights in shaders.
User controlled light counts and types.
Support for multiple lights in shaders.
User controlled light counts and types using defines
Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next

Conflicts:
	gameplay/res/shaders/colored.frag
	gameplay/res/shaders/lighting.frag
	gameplay/res/shaders/textured.frag
	samples/browser/res/common/box.material
	samples/browser/res/common/duck.material
	samples/browser/res/common/sample.material
	samples/browser/src/PostProcessSample.cpp
	samples/character/src/CharacterGame.cpp
	samples/lua/res/box.material
	samples/lua/res/game.lua
	samples/mesh/res/duck.material
	samples/mesh/src/MeshGame.cpp
	samples/spaceship/src/SpaceshipGame.cpp
Merge pull request #1207 from seanpaultaylor/next

Next
Fixed some material values for samples.
Merge pull request #1209 from seanpaultaylor/next

Fixed some material values for samples.
Renaming ControlCreator into ControlActivator and correcting missing
return value in ControlFactory::registerCustomControl
Replace advertisedDescendant mechanism in class Node with a simple search. The advertisedDescendant mechanism was only being used by PhysicsVehicle/Wheel.
Minor doc fix.
Changed the lighting.frag from phong to blinn-phong shading
Merge pull request #1212 from seanpaultaylor/next

Changed the lighting.frag from phong to blinn-phong shading
Merge pull request #1211 from kwhatmough/next

Replace advertisedDescendant mechanism in class Node with a simple searc...
Upgraded to Visual Studio 2013 (except gameplay-encoder).
Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next
Merge pull request #1213 from seanpaultaylor/next

Next
Merge remote-tracking branch 'blackberry/next' into controls_factory

Conflicts:
	gameplay/CMakeLists.txt
Merge pull request #1214 from Pixelized/controls_factory

Use of a control factory to instantiate controls (follow-up of #1192)
Code cleanup of ControlFactory.
Regenerated lua bindings.