adding test & fix for issue #1089

adding test for clobbering CRUD overrides when using resource #1089

proper logic to handle functions, strings, objects and overrides with resource #1089

additional docs for #1089

conflicting fixture #1089

simplifying the condition checking for object overrides. #1089
MERGECONFLICT for #1089 & 1074 in model_test.js
Merge pull request #1089 from bitovi/1089-resource

Model.resource is not working with inherited classes