Grid working correctly
Merge branch 'master' of github.com:omniSpectrum/omniBill