added dialog images
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/NPCs/BonbonFairy.cs
	Candyland/Candyland/NPCs/Salesman.cs
	Candyland/CandylandContent/CandylandContent.contentproj
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/CandylandContent/CandylandContent.contentproj