Added boilerplate members for CancellationToken and CancellationTokenSource
Added comments to members on CancellationToken and CancellationTokenSource
Fixed conflicts
Merge branch 'CancellationToken_story'