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
Initial zinnia integration
Some zinnia customations for using the site's theme and solve some conflicts.
yotam: bug fixes in data.
Merge pull request #49 from yotammanor/newmodel

yotam: bug fixes in data.
Merge branch 'newmodel'

Conflicts:
	kikar_hamedina/facebook_feeds/management/commands/fetchfeedproperties.py
yotam: minor fix in css.
Merge pull request #50 from yotammanor/master

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

minor fix in css
Merge pull request #52 from yotammanor/master

minor fix in css