Shitstorm
Signed-off-by: NeverSeen <neverseenone@gmail.com>
Merge branch 'game_objects' of https://github.com/serengeor/And-they-shall-know-no-fear into game_objects

Conflicts:
	PropertiesTestCases/main.cpp
	Sources/properties/iproperty.h
	Sources/properties/property.h
	Sources/properties/property_container.cpp
	Sources/properties/property_container.h
	Sources/properties/property_util.cpp
	Sources/properties/property_util.h