v1.0.0-prerelease.7 Model refactor, etc.
v1.0.0-prerelease.7 Model refactor, etc.
Merge branch 'master' of github.com:wprl/baucis
Merge branch 'development'

Conflicts:
	Model.js