enemy types
Merge branch 'master' of http://github.com/JokerNN/IlyichOutpost

Conflicts:
	proj.win32/MainFieldScene.cpp
	proj.win32/MainFieldScene.h