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
Merge branch 'newmodel'
Merge pull request #61 from yotammanor/master

Master version: kikartags, zinnia and other smaller changes
yotam: fix bug in migrations
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina
Merge pull request #62 from yotammanor/master

Master: fix bug in kikartags migrations
yotam: fix bug in tag.html
Merge branch 'newmodel' of https://github.com/hasadna/kikar-hamedina into newmodel