Resolving conflicts from new fadein/out behaviors.
Marge of html from Xuan-Dev branch.
Continued conflict resolution to include new fade functionality.