Merge branch 'master' into sww

Conflicts:
	Sheet/Cell.js
	jquery.sheet.js
	jquery.sheet.min.js