change
Merge branch 'Issue-330-combine-sample-material-Cloned-from-Merge-sample-material' of github.com:prisms-center/materialscommons.org into Issue-330-combine-sample-material-Cloned-from-Merge-sample-material
adding directives for views
added machine to default properties and modified directive
changed all templates to reflect the correct type
change
changed sample to object
directives for upper level process and sample implemented. and modified the added properties directive
added html and directive files
turned prrovenance and sample into directives
added directive and html files
removed console
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