modified buid+version
Merge branch 'master' of https://github.com/UPCnet/vilaix.buildout

Conflicts:
	buildout.cfg