Merging in changes to support administrative editing of Badge Awards