Merge pull request #15 from oerpub/note-settings

Looks good to me, merging.
Merge pull request #14 from oerpub/nopasswordprompt

Disable browser repeatedly asking to save password
allow uploading of html+images in a ZIP directly into Aloha Editor for testing
Merge branch 'master' into testing