Changed templates for measure calculation and patient builder to show last name, first name instead of the opposite