Merge branch 'master' of https://github.com/TheDonorsChoice/TheDonorsChoice

Conflicts:
app/assets/javascripts/app.js
public/javascripts/compiled-templates.js
public/templates/main/resource-template.hbs
Merged Changes

Merged “Resource” related changes