removed jquery template because of conflict with django tags
Merge branch 'master' of https://github.com/pravee-n/fuzzy-octo-bear