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

Conflicts:
	app/assets/javascripts/router.js