Merge remote-tracking branch 'origin/mchau' into Yung'sBranch

Conflicts:
	app/controllers/pledges_controller.rb
	app/views/projects/show.html.erb