very basic query object
Merge branch 'feature-5-grid' into feature-exhibraries

Conflicts:
	config/application.rb
add stock-up and book specific placeholders