Signed-off-by: Hirokazu Endo <endohirokazu@me.com>
Merge branch 'work'

Conflicts:
	jssample/WebContent/index.html

Signed-off-by: Hirokazu Endo <endohirokazu@me.com>