Merge branch 'conflict' into upstream-js-debug

Conflicts:
	docs/javascript-debugging.html
	docs/javascript-debugging/append-child-element.jpg
	docs/javascript-debugging/append-child.jpg
	docs/javascript-debugging/coffeescript.jpg
	docs/javascript-debugging/console-assert.jpg
	docs/javascript-debugging/console-trace.jpg
	docs/javascript-debugging/continue-to-resume.jpg
	docs/javascript-debugging/dynamic-script.jpg
	docs/javascript-debugging/error-stack.jpg
	docs/javascript-debugging/evaluate-while-paused.jpg
	docs/javascript-debugging/exception-stack-trace.jpg
	docs/javascript-debugging/houseMouseOut.jpg
	docs/javascript-debugging/javascript-debugging-overview.jpg
	docs/javascript-debugging/live-editing-mouseout.jpg
	docs/javascript-debugging/pause-execution.jpg
	docs/javascript-debugging/pause-resume-mouseout.jpg
	docs/javascript-debugging/pretty-print-off.jpg
	docs/javascript-debugging/pretty-print-on.jpg
	docs/javascript-debugging/raise-exception.jpg
	docs/javascript-debugging/request-send.jpg
	docs/javascript-debugging/resumed.jpg
	docs/javascript-debugging/source-mapping.jpg
	docs/javascript-debugging/tracking-exceptions.jpg
	docs/javascript-debugging/window-onerror.jpg
Delete temp file.