Merge pull request #3 from Wohlhabend-Networks/master

Repo Sync
Added a generic icon
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	smbx-npc-editor/NpcConfigFileTest/App.config
Merge pull request #5 from Luigifan/master

Repo Sync