almost have map tiles working
merged with makr
Merge branch 'master' into map_tiles

Conflicts:
	src/app.coffee
merged with makr
Merge branch 'master' of https://github.com/dcrosby42/aoldrts into map_tiles
changed where MapTiles was registered in order to cause a bug to happen earlier
merged
do NOT serialize functions
Pixi upgrade
Merge branch 'master' into map_tiles

Conflicts:
	public/js/app.js
	src/rts_world.coffee
remove extra debugger call
Updated
merged with master
Merge branch 'master' into map_tiles
BUG.  Removing a sprite needs to use pixiWrapper.sprites.removeChild
update
Resetting the entity inspector each time it refreshes, to clear old data
oops this is needed too
HACK: makr.js World.prototype.create now uses a NEW ENTITY ID when re-using dead entity objects.
minified makr no longer corresponds to the makr.js file in public/js/lib because croz hack in 5d3a811b40f0706493f3683a303009a4ae7e6f41