Added basic entities for the Dialogue entity
Merge branch 'master' of github.com:JimWest/ExtraEntitesMod
Removed unnecessary files
Merge branch 'master' of github.com:JimWest/ExtraEntitesMod
Added a powerNodeStartDestroyed to gametype picker.
Merge branch 'master' of github.com:JimWest/ExtraEntitesMod

Conflicts:
	output/editor_setup.xml
Added entity info for difficulty and upgrades
A minor tweak to the tooltip
Added stubs for difficulty and Npcupgrades
Merge branch 'master' of github.com:JimWest/ExtraEntitesMod
NPC Mixin comments
Merge branch 'refs/remotes/origin/master'
Rubbish
Updated the dialogue GUI
Merge branch 'master' of github.com:AlexHayton/ExtraEntitesMod
Fixed weird versions of the models etc.
Merge branch 'master' of github.com:AlexHayton/ExtraEntitesMod
Reinstated the old preview.jpg
Tweaks to the basic difficulty code.
Merge pull request #5 from AlexHayton/master

New files for base difficulty and upgrades and the dialogue entity.