- locked version due to bug in alamid-class
- loosed alamid-class version again
Merge branch 'master' into refactor-model-junction

Conflicts:
	package.json
- Model.prototype.set now calls for the special properties "id" and "ids" the special setter .setId() and .setIds() respectively