wait周りのバグを修正 close #248
Merge branch 'development' of 192.168.11.68:vox into development

Conflicts:
	VOXCHRONICLE/Resources/ios/Info.plist
Merge branch 'wildhawk' of github.com:giginet/VOXCHRONICLE into wildhawk

Conflicts:
	VOXCHRONICLE/Resources/Script/messages/death.lua
onLevelが2回呼ばれてるヤバいバグを修正 close #255 close #262
Merge branch 'wildhawk2' into development
文法ミス直した