created ContentProviders and ContentProvidersUsers join table. closes #10
fixed merge conflicts