Merge branch 'agamrafaeli-master' into newmodel
And some migrationt stuff.

Conflicts:
	kikar_hamedina/core/plain_urls.py
	kikar_hamedina/core/plain_views.py