Merge branch 'develop'

Conflicts:
	dist/summernote.min.js