Don't call toJSON if the method does not exist
Salad 0.2.6.

Bugfix for template serialization
Fix name clash
Merge branch 'master' into feature/scopeFromParams

* master:
  Fix name clash
  Salad 0.2.6.
  Don't call toJSON if the method does not exist

Conflicts:
	src/controllers/mixins/resource.coffee