Social links in the receipt page
Merge branch 'master' of https://github.com/MayOneUS/pledgeservice

Conflicts:
	markup/receipt.jade.j2
Fixed bad merge tags in template
Fixed bad merge tag