Merge pull request #61 from yotammanor/master

Master version: kikartags, zinnia and other smaller changes
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina