Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	.gitmodules
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	.gitmodules
Make CCXMLParser thread safe (avoid re entry on same thread). github issue: #964
Fix orientation bug for ios8/xcode6 builds (by forcing the orientation of the statusbar, yes this is a weird hack to work around Apple's bug). github issue: #973
Ensuring that the android test project compiles (just added android target for a new effect).
Merge pull request #987 from osinoleg/develop

Bug fixes (#964 #973) - TileMap and Orientation fixes.
Merge pull request #989 from thayerandrews/develop

CCEffects - Stacking bug fixes plus test additions
CCEffectContrast - Fix for negative contrast values

Multiply the constant offset value, 0.5, by the input alpha value to make sure it is
also in premultiplied alpha space as the RGB values are. Without this correction,
input RGB values of (0,0,0) can become non-(0,0,0) when the contrast adjustment
is less than 1.0.