Merged latest master; minor refactor to names of routing appSettings; added hidden field to track sort order.