change page title to "DFP test"
Merge remote-tracking branch 'origin/master'

Conflicts:
	dfp/index.php

resolve the conflict by changing the page title to "DFP demo"