registering in GRID
Merge branch 'master' of github.com:jeffsu/red-velvet

Conflicts:
	lib/system/controller.coffee