Demo changes
Added aloha ephemera elements so visual parts of the editor can be removed
Merged Marvin's changes