Tiny changes
Merge branch 'master' of https://github.com/Luigifan/smbx-npc-editor-2 into Luigifan-master

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Luigifan/smbx-npc-editor-2.git into Luigifan-master

Conflicts:
	smbx-npc-editor/NpcConfigFileTest/App.config
Merge pull request #2 from Wohlhabend-Networks/Luigifan-master

Luigifan master