change to machine template - added serial number and fixed detector type, model
added force capacity to machine
support floating number validation
Remove old fields and rename.
Update templates to add in an "attribute" field. This will be used in
the future when we transform a template into individual objects. The
attribute field will be used for the object hash name.
added attributes to the templates
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint
Break out materials code from machine code.
Update to remove creating the history database. Since we are not making
use of the history database this just slowed down start.
Rename file to match its id.
Create a service to transform templates into the object we would save in
our system.
Fix python formatting issues.
Merge branch 'Issue-330-combine-sample-material-Cloned-from-Merge-sample-material' into Issue-330-template-rework

Conflicts:
	backend/mcapi/machine.py
	backend/scripts/dbcreate.py
Merge branch 'current-sprint' into Issue-330-template-rework

Conflicts:
	backend/mcapiserver.py
	backend/scripts/templates/APT Instrument Properties.json
	backend/scripts/templates/APT Sample Preparation.json
	backend/scripts/templates/Angle Properties.json
	backend/scripts/templates/Machine.json
	backend/scripts/templates/Sample.json
Update templates to new model. Update mktemplate.py to simply load a
template file and not do any transformations on it.
Remove commented out code. Directive isn't working because I removed
removed a dependent library.
Cleanup references to model and additional/default. The model property
was removed, and additional_properties/default_properties were moved to
its level. In some cases the attributes were called additional/default-
these were renamed.
Remove model references for provenance.
Merge remote-tracking branch 'origin/Issue-330-combine-sample-material-Cloned-from-Merge-sample-material' into Issue-330-template-rework

Conflicts:
	backend/scripts/templates/APT.json
	website/app/application/provenance/iosteps/iostep/iostep.html