adds an 'or' to static_placeholder templatetag if it is empty
fix tests
Merge pull request #2510 from digi604/fix-2504

adds an 'or' to static_placeholder templatetag if it is empty