corrected some grid problems while auto layout is executing
Merge branch 'master' of https://github.com/resultares/esolutions