fix for safari form edit bug
minor change to mockMbass
merge conflicts
add check for fieldModel before performing an operation on it