Included files/changes from Love & War update.

Need to double check all changes before moving on with modifications.