Merge branch 'master' of https://github.com/ccrisan/motioneye into movie-playback

diff --cc motioneye/handlers.py
index 69bb8dcd8e1d7f23d926ca2a7526b6d4e14df7d6,1d30196a16b07a68bcdbbe661e0b8ed7fd0b7d7a..215582fccbe68b85cde1f7190df9835da21423c8
--- 1/motioneye/handlers.py
--- 2/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@@ -16,9 -16,9 +16,10 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  
  import datetime
+ import hashlib
  import json
  import logging
 +import mimetypes
  import os
  import re
  import socket

diff --cc motioneye/static/css/main.css
Simple merge

diff --cc motioneye/static/js/main.js
Simple merge