yotam: fix tagging bug in production, minor change in navbar layout
Merge pull request #70 from yotammanor/master

yotam: fix tagging bug in production, minor change in navbar layout
Merge branch 'newmodel'

Conflicts:
	kikar_hamedina/templates/layouts/generic-template.html
Merge branch 'newmodel'
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina
Live Changes - paginate review-tags, register missing admin models and deregister redundant.
Live Changes - Updade fixture data. removed gidon saar, added leon litintsky, updated hilik bar
Merge pull request #89 from yotammanor/newmodel

Changes from master