scaffold
Merge branch 'master' of https://github.com/ngSymbiosis/ngSymbiosis.model

Conflicts:
	README.md