Merge pull request #63 from yotammanor/master

yotam: fix bug in tag.html
yotam: disable status panel update temporarily
Merge pull request #65 from yotammanor/master

yotam: disable status panel update temporarily
yotam: disable status panel update temporarily
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina
Merge pull request #66 from yotammanor/master

Master: change endless pagination configuration in production
yotam: disable addTagToStatus - fcousin event trigger in production
yotam: reenable addTagToStatus - fcousin event trigger in production
Merge pull request #67 from yotammanor/master

yotam: reenable addTagToStatus - fcousin event trigger in production
yotam: change addTagToStatus - change bind to on
yotam: change addTagToStatus - add binding in endlessPagination onCompleted
yotam: change addTagToStatus - add binding through delegation.
Merge branch 'master' of https://github.com/hasadna/kikar-hamedina
Merge pull request #68 from yotammanor/master

yotam: addToStatus - solution number 1
Added new_design_prototype including Nir's changes
yotam: minor 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
moved zinnia template overrides so they will take effect