Updated gs.skin.ogn.edem
Merge branch 'master' of github.com:e-democracy/buildout-config

Conflicts:
	custom.cfg