delete parsedQuery
Merge branch 'master' of github.com:ciir/Proteus
A bit of refactoring toward returning documents for a given tag
Merge pull request #14 from bzifkin/master

Capturing Enter, Adapting Page render for books
fixing up a merge issueerge remote-tracking branch 'upstream/master'

Conflicts:
	homer/web/js/ui.js