commit for merge
Merge branch 'master' of https://github.com/azusanakano/factory

Conflicts:
	libalt/libalt/altBase/altBaseMem.cpp
	libalt/libalt/altBase/altUtil.h
	libalt/libalt/altBase/altWStr.cpp