Merge branch 'tb-giveaway'

Conflicts:
	header.php
Merge branch 'tb-giveaway'
partner app initial import of code
Merge branch 'rr-webtolead' into staging