added proposals
added in diff resource refs and tests
Merge pull request #6 from vforgione/dev

merge proposals and diff integration