Demo done.
Merge branch 'eventText'

Conflicts:
	CCG/CCG.xcodeproj/xcuserdata/jamesli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Bug fix.