Merge pull request #60 from yotammanor/newmodel

logos and is_suggestion in tags, and some minor changes
Merge branch 'newmodel' of https://github.com/hasadna/kikar-hamedina into newmodel
Merge pull request #64 from yotammanor/newmodel

minor bug fixes in production mode
added static html folder for the new design. the server isn't serving these files. it can only be viewed locally
Merge pull request #69 from elie222/newmodel

added static html folder for the new design
Added new_design_prototype including Nir's changes
Merge branch 'master' into newmodel
Merge branch 'newmodel' of https://github.com/hasadna/kikar-hamedina into newmodel
Merge https://github.com/yotammanor/kikar-hamedina into newmodel

Conflicts:
	kikar_hamedina/new_design_prototype/css/mobile-first.css
	kikar_hamedina/new_design_prototype/fonts/glyphicons-halflings-regular.eot
	kikar_hamedina/new_design_prototype/fonts/glyphicons-halflings-regular.svg
	kikar_hamedina/new_design_prototype/fonts/glyphicons-halflings-regular.ttf
	kikar_hamedina/new_design_prototype/fonts/glyphicons-halflings-regular.woff
	kikar_hamedina/new_design_prototype/html/mobile-first.html
	kikar_hamedina/new_design_prototype/src/less/bootstrap/.csscomb.json
	kikar_hamedina/new_design_prototype/src/less/bootstrap/.csslintrc
	kikar_hamedina/new_design_prototype/src/less/bootstrap/alerts.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/badges.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/bootstrap.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/breadcrumbs.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/button-groups.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/buttons.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/carousel.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/close.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/code.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/component-animations.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/dropdowns.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/forms.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/glyphicons.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/grid.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/input-groups.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/jumbotron.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/labels.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/list-group.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/media.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/alerts.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/background-variant.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/border-radius.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/buttons.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/center-block.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/clearfix.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/forms.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/gradients.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/grid-framework.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/grid.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/hide-text.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/image.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/labels.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/list-group.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/nav-divider.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/nav-vertical-align.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/opacity.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/pagination.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/panels.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/progress-bar.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/reset-filter.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/resize.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/responsive-visibility.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/size.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/tab-focus.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/table-row.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/text-emphasis.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/text-overflow.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/mixins/vendor-prefixes.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/modals.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/navbar.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/navs.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/normalize.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/pager.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/pagination.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/panels.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/popovers.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/print.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/progress-bars.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/responsive-embed.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/responsive-utilities.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/scaffolding.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/tables.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/theme.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/thumbnails.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/tooltip.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/type.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/utilities.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/variables.less
	kikar_hamedina/new_design_prototype/src/less/bootstrap/wells.less
Merge pull request #70 from yotammanor/master

yotam: fix tagging bug in production, minor change in navbar layout
moved zinnia template overrides so they will take effect
Status count fields now have default=0 and null=False. This simplifies sorting in views.py.
Set count fields to zero rather than None in some scripts
added updater app - a notifying mechanism which allows users to subscribe to specific events(such as post with many likes, etc...), and get updates by various ways(mail,sms, etc...)
working on newest.html which will be the final design. work in progress
yotam: changes in navbar layout, changes to improve responsiveness
Merge branch 'shygon-newmodel' into newmodel
Merge branch 'updater' of https://github.com/nirshub/kikar-hamedina into nirshub-updater
Merge branch 'nirshub-updater' into newmodel
Merge branch 'newmodel' of https://github.com/elie222/kikar-hamedina into elie222-newmodel

Conflicts:
	kikar_hamedina/new_design_prototype/css/bootstrap-rtl.min.css
	kikar_hamedina/new_design_prototype/css/mobile-first.css
	kikar_hamedina/new_design_prototype/img/netanyahu.jpg