cleanup of template names
bugfixes on the go
Merge branch 'master' of github.com:palasthotel/grid