Merge changes
Merge branch 'master' of https://github.com/YunRoaster/RoasterControl

Conflicts:
	www/index.html