Renamed provider and one contract file
Merge pull request #1 from UbiCollab/master

Merge pull request #16 from finnjohansen/master
Merge pull request #17 from finnjohansen/master

Sync with origin