Added nestoria query scaffolding.
Merge branch 'master' of github.com:Xian618/happyhouse2

Conflicts:
	config/routes.rb