fix
Merge branch 'develop' of https://github.com/phi-jp/tmlib.js into develop

Conflicts:
	index.html