update method
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/parchment.js
Merge remote-tracking branch 'origin/master'