Merge branch 'master' into stoutford_tests

AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java

@@ -277,6 +277,8 @@ public final class ConversationController {
 			case hasActorCondition:
 				result =  player.hasCondition(requirement.requireID);
 				break;
+			case factionScore:
+				result = player.getAlignment(requirement.requireID) >= requirement.value;
 			default:
 				result =  true;
 		}

AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java

@@ -16,6 +16,7 @@ public final class Requirement {
 		,spentGold
 		,consumedBonemeals
 		,hasActorCondition
+		,factionScore
 	}
 
 	public final RequirementType requireType;