Collision updates
Merge github.com:Xemerau/Enraged_Aves
Actual Final
Merge https://github.com/Xemerau/Enraged_Aves

Conflicts:
	PhysEngine2D.cpp
	game_object.h
	sprite_application.cpp

Too many commits