Experimental new resolution/merging

Resolution now works by adding all the minimum penetration vectors
togheter and finding the middle value (this prevents getting stuck in an
infinite resolving loop between two bodies)

Since the new resolution method re-introduces the "crack" problem, I had
to figure out a way to merge adjacent AABB bodies