Merge pull request #49 from yotammanor/newmodel

yotam: bug fixes in data.
Merge branch 'newmodel' of https://github.com/hasadna/kikar-hamedina into newmodel