More refactor
Merge branch 'webview' of github.com:CrowdDJ/player into webview

Conflicts:
	res/html/main.html