Minor updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/html/main.html
main.html removed
Restore main.html