add failing test for tree visibility quirks
fix tests
add json gem to dependencies
Merge branch 'master' into xmpp

Conflicts:
	Gemfile.lock