ASDocs build without error.
Merge branch 'master' of git://github.com/Draknek/FlashPunk

Conflicts:
	net/flashpunk/FP.as
	net/flashpunk/graphics/Canvas.as