final tweaks
Merge branch 'master' of https://github.com/calyja/zoen-sf2

Conflicts:
	web/bundles/acmedemo/css/contact.css
	web/bundles/acmedemo/css/dendrology-stockating.css
	web/bundles/acmedemo/css/project.css
	web/bundles/acmedemo/css/projects.css
	web/bundles/acmedemo/css/small-architecture.css
	web/bundles/acmedemo/css/workshop.css
	web/bundles/acmedemo/css/zoen.css
	web/bundles/acmedemo/images/ma/ma-1-1.jpg