Merge pull request #1421 from blackberry/next

Next
Merge pull request #1424 from blackberry/next

Next
Merge pull request #1430 from blackberry/next

Next
Merge pull request #1433 from blackberry/next

Next
Merge pull request #1436 from blackberry/next

Next
Fixed bug in Effect.cpp where the OpenGL function glGetActiveUniform is called with a wrong parameter, causing an assertion failure on some graphic cards.
Fixed memory leak.
Update Container.cpp

Fix for addControl().

Rearranged execution.
Adds ref before removing control from current parent, avoiding deletion of control.
Merge pull request #1443 from KJO/master

Fix for addControl prematurely deleting control.
Merge pull request #1441 from olee/master

Fixed bug in Effect.cpp where glGetActiveUniform is called with a wrong parameter
Merge pull request #1446 from blackberry/master

Merge master to next.