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

Conflicts:
	gameplay/src/ImageControl.cpp
Merge remote-tracking branch 'upstream/next' into next

Conflicts:
	tools/encoder/src/TTFFontEncoder.cpp
Merge branch 'next' of https://github.com/zarelaky/GamePlay into next
fixed compile error with vs2012
Merge branch 'next' of https://github.com/zarelaky/GamePlay into next
Renaming ControlCreator into ControlActivator and correcting missing
return value in ControlFactory::registerCustomControl
Merge remote-tracking branch 'upstream/next' into 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.
Merge pull request #1215 from seanpaultaylor/next

Code cleanup of ControlFactory.
Updated for ControlFactory
Merge pull request #1216 from seanpaultaylor/next

Updated for ControlFactory
Updated XCode projects
Merge pull request #1217 from seanpaultaylor/next

Updated XCode projects
Fixed shader for duplicate skinning code
Merge pull request #1218 from seanpaultaylor/next

Fixed shader for duplicate skinning code
Merge remote-tracking branch 'upstream/next' into next
Merge branch 'next' into next_vs2010