Bug in grid.js, and bug in contact_session
Merge branch 'master' of https://github.com/KernelCorp/masterpiece