Merged Lupe's update of Administrator Panel
Merge remote-tracking branch 'upstream/master'