Div
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/list.html
hc push
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/article.html
	app/develop/components/siteheader.html
	app/develop/d_article.html
	app/index.html
	app/list.html