fixed bot & enhanced set page
Merge branch 'master' of https://github.com/vhs/vhstv

Conflicts:
	main.js