resized notes text area, changed title
fixed typo in CanvasHelper
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/annotation/Annotation.js
Merge remote-tracking branch 'origin/master'