Merge branch 'manual-display' of github.com:facebook/AsyncDisplayKit into manual-display

Conflicts:
	examples/WaitWaitDontShowMe/Sample/AppDelegate.m
Merge branch 'manual-display' of github.com:facebook/AsyncDisplayKit into manual-display