scope is now created from url params
missing changes
fix error
something is broken with whitespace fixing
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
only allow parameters that represent an attribute for where conditions
do it the coffee way
refactored for loop
fix merge conflict
remove block comment
existence of associations are now checked
Merge pull request #3 from komola/feature/scopeFromParams

Feature/scope from params