Fixed useages of deprecated templatetags
Merge pull request #384 from kaedroho/deprecation-warning-cleanup

Fixed useages of deprecated templatetags