Changed dfp_tag to support multiple targeting keys.
Added string conversion
Removed extra spacing
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	dfp/templatetags/dfp_tags.py
Merge pull request #1 from jpaidoussi/develop

Add multiple targeting key-value pairs