[SW016] Added full NPC list
Merge branch 'master' of https://github.com/MEdward/TrinityCore

Conflicts:
	src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h