Created edem.skin
Added edem.content.email.css
Merge branch 'master' into 2014-skin
Created edem.content.email.layout
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin
Created edem.content.layout
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin
Created edem.group.about
Created edem.sponsors
Including GSParticipation Stats
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin

Conflicts:
	versions.cfg
Commenting out E-Dem customization of add/invite, since they no longer work
Merge branch 'master' into 2014-skin

Conflicts:
	buildout.cfg
	versions.cfg
Merge branch 'master' into 2014-skin
Merge branch 'master' into 2014-skin