Refactoring for AdapterEx GetEntityObjectId 2 overloaded methods added and the other methods removed.
Merge branch 'master' of https://github.com/RtsAiResearch/IStrategizer

Conflicts:
	Include/IStrategizer/AbstractAdapter.h
	Include/IStrategizer/AdapterEx.h
	Source/IStrategizer/AdapterEx.cpp
	Source/IStrategizer/AttackEntityAction.cpp
	Source/IStrategizer/AttackGroundAction.cpp
	Source/IStrategizer/BuildActionEx.cpp
Merge branch 'conditions' of https://github.com/ogail/IStrategizer

Conflicts:
	Build/Debug/IStrategizerEx.cb
	Source/IStrategizer/AdapterEx.cpp
	Source/IStrategizer/AttackEntityAction.cpp
	Source/IStrategizer/AttackGroundAction.cpp
	Source/IStrategizer/BuildActionEx.cpp
indentation
Apply CR
fix spacing
Fix after review
Merge pull request #4 from mohamed-samir-mohamed/master

EntityObjectId
Merge branch 'master' into conditions
Merge branch 'conditions' of github.com:ogail/IStrategizer into conditions
Remove Colony
Merge branch 'conditions' of https://github.com/ogail/IStrategizer