Merge pull request #5593 from RosettaCommons/solberg/foldit_reconciliation Old changes from Foldit that never got reintegrated into master