local fix to fetchfeedproperties to be dealt with in a merge
Merge branch 'master' of https://github.com/yotammanor/kikar-hamedina

Conflicts:
	kikar_hamedina/facebook_feeds/management/commands/fetchfeedproperties.py
Merge branch 'newmodel'

Conflicts:
	kikar_hamedina/facebook_feeds/management/commands/fetchfeedproperties.py
Merge pull request #25 from yotammanor/master

Master: Fix insights MemoryError (try 1)
Merge branch 'newmodel'
Merge pull request #31 from yotammanor/master

Add All kinds of features and changes.
Merge branch 'newmodel'
Merge pull request #33 from yotammanor/master

Some changes to Homepage
Merge branch 'newmodel'

Conflicts:
	kikar_hamedina/facebook_feeds/management/commands/fetchfeedproperties.py
Merge pull request #50 from yotammanor/master

yotam: Stable sub-version with last improvments
Merge branch 'newmodel'
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina
Merge pull request #52 from yotammanor/master

minor fix in css
yotam: Add basic django-taggit feature. Reorganize installed_apps in settings.py
yotam: minor change to vagrantfile - make loaddata more verbose
yotam: create kikartags app as inherited taggit models, first steps toward integration with website
yotam: create management command to convert old tags to new tags. add unicode slugify solution
yotam: substitute all tags with kikartags in core.views
yotam: remove redundant add_tag function from core.views and core.urls
yotam: rename kikartags models to usable names, rename (through 'as') facebook_feeds.Tag to OldTag. Ensure maintained usability of features through the change.