zira - cover background
Merge branch 'master' of https://github.com/saarsta/shitufim
Merge branch 'master' of https://github.com/saarsta/shitufim
is admin only to production
Merge branch 'staging' of github.com:saarsta/shitufim
Merge branch 'staging'

Conflicts:
	app.js
עדכונים אחרונים בקרוב
Merge branch 'master' of https://github.com/saarsta/shitufim
Merge branch 'staging'
vote on suggestion
Merge branch 'staging'