Minor bugfixes/merge and build resolutions.

Affected: GameResources.cpp
GameResources.h
collision_test.cpp