MBH: working on admin
MBH: working
MBH: adding file
MBH: saving before Monday
MBH: all admin fetures for next release
Merge remote-tracking branch 'matt_harris/devel' into devel