added back settings.py to aws branch
merged master
merged master
added applicaton/octet-stream to epub upload
merged master
merged epubjs-reader
merged epubjs-reader
merged epubjs-reader
merged epubjs-reader
merged epubjs-reader
merged epubjs-reader
fixed bug
fixed tool bar bug in hypothesis.js directive
removed setVisibileHighlights from annotation Viewer/Editor hidden
temporary hypothesis.js directive fix
updated hypothesis directive again
removed settings.py