added admin to edit weights and provider mappings
Merge remote-tracking branch 'origin/master'