resync
Merge branch 'master' of https://github.com/chesteraustin/hostmedia

Conflicts:
	lego/script.js