moved templatetags
Merge pull request #2414 from digi604/move_palceholder_templatetags

moved templatetags