BISERVER-10116 Samples should be checked in individually, the
assembly should produce the samples zip.

Conflicts:
	assembly/package-res/biserver/pentaho-solutions/system/default-content/samples-5.0.zip
New CE samples
- Fixed merge conflict