local2
Merge branch 'developer' of https://github.com/yamaweb/js into developer

Conflicts:
	dev.html