Update Python 2.7.3 to 2.7.4.
Pin egg versions
Use slapos.recipe.cmmi instead of hexagonit.recipe.download.
Pin hexagonit.recipe.download nexedi version in slapos stack.
Merge branch 'erp5-component' into erp5
Merge branch 'erp5'

Conflicts:
	component/curl/buildout.cfg
Merge branch 'master' into erp5-component