Cleaned up Controllers
Turned off shortcut blueprints
Merge branch 'cleanup' into docs

Conflicts:
	api/controllers/ApiController.js