some changes
Merge branch 'rc' of github.com:palasthotel/grid into rc