yotam: some text changes in homepage
yotam: fix bug in facebook_status.html
Merge branch 'newmodel' of https://github.com/daonb/kikar-hamedina into newmodel
Refactoring settings and some cleanup