overlay on MS site
Merge branch 'master' of github.com:bitmage/webblaster

Conflicts:
	public/script/main.js