rename
Merge branch 'master' of github.com:kiwiyuki/Yanagi-ni-Tsubame

Conflicts:
	Yanagi-ni-Tsubame/models/socketio.js