manual
Merge branch 'master' of github.com:erelsgl/erel-sites