Added broken FireflyNPC, all related code commented out for now.
Merge 1 for previous commit
Merge branch 'master' of https://github.com/cakelake/FireFly