update libertree-model
Merge branch 'master' into xmpp

Conflicts:
	Gemfile.lock