Merge branch 'master' of E:\Project\lite-mms\lite-mms with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lite_mms/apis/notify.py
	lite_mms/templates/layout.html
fix a bit of bugs