new deployment test
Merge branch 'master' of github.com:JeromeSonnet/beCloud-OpenERP-modules

Conflicts:
	.openshift/action_hooks/build