Merge pull request #33 from lramsey/integrating

resume
Modify bg-editor.js - remove isPaused from editor.js
Merge pull request #34 from fay-jai/fixAnnotation

Modify bg-editor.js - remove isPaused from editor.js
fix replay bug. only replay issue is unavailbale save text box
Merge branch 'master' of https://github.com/klickr/klickr-chrome into integrating

Conflicts:
	bg/bg-editor.js