Announce merge from elemar-
Added talking points from hasadna workshop
Merge branch 'gh-pages'