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

Conflicts:
	.gitignore
	smbx-npc-editor/NpcConfigFileTest/App.config