fixed editRest.jade
aleks merging at 230
Merge branch 'aleks' into development