Use trade phase to match movements.

Note: Trade phase is setup twice: once on object and then as
membership_criterion_category.

Message was: <ERP5Type.ConsistencyMessage for PropertyTypeValidity on
    web_site_module/hosting (message: Attribute layout_additional_css should be
    of type string but is of type <type 'tuple'>)>

Warning: if you thought that Romain's hack was dirty, this
is worse. Anyway, this could suffer from having several
slave instance with the same title. Be aware.

Conflicts:

	master/bt5/vifib_slap/bt/revision

In Vifib Subscription Item Root Simulation Rule movements are related to
delivery path.

Do not scatter so much between Business Templates portal type definitions.

This reverts commit ddeaf310.

Note: Always use pyflakes.

Note: Always use pyflakes.

Support new NoVNC version

Conflicts:

	master/bt5/vifib_data_simulation/bt/revision

Support new NoVNC version