Changes from macbook AIR
Merge branch 'master' of https://github.com/shaunus84/argh-zombie-robots

Conflicts:
	ZombieSideScrolling/assets/config/level1.xml
	ZombieSideScrolling/bin/ZombieSideScrolling.swf
	ZombieSideScrolling/src/ZombieSideScrolling.as
	ZombieSideScrolling/src/com/culpritgames/zombies/core/AssetLoader.as
	ZombieSideScrolling/src/com/culpritgames/zombies/entities/Entity.as