Merged trial package with mainstream.

Trial layouts are inflated only if package name contains PROva.

All trial-related stuff is instantiated if package name contains PROva.