Add dispute resource
Fix timer in dispute test
edit dispute test
change method of getting dispute
Add dispute resource and tests
Fix merge conflict
Edit changelog
Merge pull request #88 from rserna2010/disputes_resource

Add disputes resource & tests