Merge pull request #2331 from mtwebster/revert-fallback

Revert "Use the stock cinnamon theme as a 'fallback' theme..."
Merge pull request #2326 from mtwebster/user-applet-duh

Fix user applet log out/shut down, and some other things
Add launcher/desktop file editor.

Replaces:
    - Item and Category properties in Menu editor
    - Panel launcher editor/creator
    - Nemo Add Launcher (to be replaced by actions)