live edit mode
web
update js
Merge branch 'gh-pages' of github.com:hcs64/obot into gh-pages

Conflicts:
	obot.js
	obot.map
update