Merge remote-tracking branch 'origin/redraw_js_event'

Conflicts:
Baker.xcodeproj/project.pbxproj
BakerView/BakerViewController.h