added compatibility of edit button
Merge branch 'master' of ssh://github.com/Kritin/UoG_DIM3_LabRats