jsbeautify
update guide
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/base/string.js
	src/event/Event.js
	src/event/EventTarget.js
	src/util/cookie.js