Initial commit.
Oops.  Forgot to commit all the stuff we did.
Started on Gestalt stuff.
Merge branch 'master' into permissions

Conflicts:
	controllers/module.controller.js