Fixes setVisible(false) for 2D controls without forcing all controls to be re-drawn.
Issue #751.  Layout::align() takes a control's margin into account.
This change also adds a bottom-right-aligned button with margins to the basic form controls test.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	gameplay/src/Form.cpp
Merge pull request #754 from seanpaultaylor/next

Next
Reverting gameplay/.cproject
Merge pull request #755 from ablake/next

A couple UI fixes.
Merge pull request #756 from seanpaultaylor/next

Updated xcode template for iOS 6 SDK
Fixing a minor issue in the light test. Green and blue intensity sliders now function properly.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #758 from dtomilovskiy/next

Next
Updated Terrain test to use a 3 splat layers instead of 2.
Misc other tweaks to Terrain test.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #759 from sgrenier/next

Terrain test updates
Fix to release resources when terrain test exits.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #760 from sgrenier/next

Fix to release resources when terrain test exits.
Fixed doxygen warnings on Game.
Updated gameplay-api html for v1.6.0