upgrade angoose version
merge

Conflicts:
	package.json