Fixed deprecation warnings for cache_page and truncate_words
Merge remote-tracking branch 'upstream/master' into upmaster
More deprecation fixes for django.conf.urls.defaults->django.conf.urls
Merge branch 'master' of github.com:hasadna/Open-Knesset