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

Conflicts:
	tnk1/_magr/board_tnk1.sql
Merge branch 'master' of github.com:erelsgl/erel-sites
Merge branch 'master' of github.com:erelsgl/erel-sites
Merge branch 'master' of github.com:erelsgl/erel-sites
Merge branch 'master' of github.com:erelsgl/erel-sites
Merge branch 'master' of github.com:erelsgl/erel-sites
Merge branch 'master' of github.com:erelsgl/erel-sites
manual