Merge remote-tracking branch 'origin/flixelNME' into flixelNME
This time had to fix package from addons to addons.nape on both classes... hopefully this time its fixed.