cleaning
Merge branch 'master' of https://github.com/wanderer/sails-generic-controller

Conflicts:
	controller.generic.coffee