Merge with andy1138-tutorial.  In the process, ListDemo's cancel button was fixed and some stray comments were removed.