Spent my lunch formatting regexes... I am lame.
committing last night's changes that were stashed
Merge branch 'develop' feature/npc-experience_50

all better

Conflicts:
	xml/npcs.xml
Merge branch 'feature/npc-experience_50' into develop
fixed some bugs and tests with flag.