no message
no message
Merge branch 'dev'

Conflicts:
	samples/jquery.plugin.html