added collision pairs

changed pre-update structure
Merge https://github.com/Geokureli/Flash

Conflicts:
	games/FlxGreed/bin/FlxGreed.swf
	games/FlxGreed/res/levels/testLevel.xml