edit login.lua & roomselect.lua
Merge branch 'master' of https://github.com/mhidaka/playgroundthon

Conflicts:
	attack-on-deadline/RoomSelect.lua
Merge branch 'master' of https://github.com/mhidaka/playgroundthon

Conflicts:
	attack-on-deadline/RoomSelect.lua
Merge branch 'master' of https://github.com/mhidaka/playgroundthon