added logic for DialogManager and basic stuff for KingRodelle
forgot a continue statement
Merge branch 'master' into james_dev