Commit
Merge branch 'master' of https://github.com/hoshi89/Forgotten

Conflicts:
	Forgotten/Forgotten/DialogCls.cpp
	Forgotten/Forgotten/DialogCls.h
	Forgotten/Forgotten/DialogOwnerCls.cpp