Hve removed authority
Resolve conflicts
Merge branch 'master' of https://github.com/techvision/brails4
Have writen javascript for grid. Have corrected roles of the grid
Addded grid.js
Merge branch 'master' of https://github.com/techvision/brails4