developed new code for administration
Merge remote-tracking branch 'origin/master'