mozilla-appmaker/appmaker — pull request #837 by flukeout (2014-01-23 23:45:15+00:00)
Title: Removing card-top and card bottom from the editor, it doesn't work anyway.

And some merge fixes.