box editor foo
Merge branch 'rc' of github.com:palasthotel/grid into rc

Conflicts:
	js/app/GridViews.js