# Conflicts:
#	cell/apiDefines.js
#	cell/model/Workbook.js
#	cell/view/WorksheetView.js
#	common/editorscommon.js