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
CCEffectStack - Make stitchEffects a class method

There's no reason for it to be an instance method so in the interest of compartmentalization
I'm changing it.
CCEffectStack - Fix a bug in stitching of multi-pass effects like bloom and blur

The passes of these effects would be improperly collapsed into a single pass which
cannot be done since they must maintain their multi-pass implementation. Fix this
and add a test that exercises this use case.
Ensuring that the android test project compiles (just added android target for a new effect).
CCEffectsTest - More sprites in the performance test plus stacks of stacks
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
Merge branch 'develop' into metal-hacking

Conflicts:
	cocos2d-ios.xcodeproj/project.pbxproj