fix bad merge
fix bad merge
Changes for jpetto:
 - fade quickly
 - declare var closeText once
 - show closeText next to the X button