no m3u8
Merge https://github.com/mrdre/mfc

Conflicts:
	lib/template/loggedIn.html
Merge https://github.com/mrdre/mfc
Merge https://github.com/mrdre/mfc