Renamed options for @resource and @belongsTo
Merge branch 'master' of github.com:komola/salad

* 'master' of github.com:komola/salad:
  Published new version
Changed up dependencies. Increased version number