Updates to pprovenance transofmration:
   * input/output conditions are now arrays
   * Handle samples as a one off for the moment.
   * Changes to model service related to new model.
Move all conditions and files into attributes called inputs and outputs,
rather than having separate input_{files, conditions} and output_{files,
conditions}
Merge remote-tracking branch 'origin/Issue-330-combine-sample-material-Cloned-from-Merge-sample-material' into Issue-330-template-rework

Conflicts:
	website/app/application/directives/default-properties.html