Textbox/NPC
Merge remote-tracking branch 'origin/master'

Conflicts:
	sourcefiles/GXPEngine/Level.cs
	sourcefiles/GXPEngine/bin/Debug/levels/level1.tmx