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

Conflicts:
	VOXCHRONICLE/Resources/ios/Info.plist