Merge pull request #33 from pkkup/master

loadjs templatetag