Merged document should return empty hash not nil if there is no content to return
Merge pull request #60 from bengler/emptydocumentfix

Merged document should return empty hash not nil if there is no content to return
Update rack-protection to fix InvalidUriError caused by norwegian characters
Support occurrences params in /count api
Convert existing id to string while checking for oid assignment
Revert "Convert existing id to string while checking for oid assignment"

This reverts commit d1d3af9279d5f37822c07ab7c56d498b9b022b4a.
Proper conversion of existing id to string while checking for oid assignment
Update dev struct sql
Add rollbar gem (alternative to Airbrake).
Remove calendar hack
Update pebblebed
Gemfile: upgraded eventmachine.
Merge branch 'master' into upgrade2014
Update pebblebed
Gemfile: upgrade Unicorn.
Take klass and realm into account when querying posts by  external_ids to optimize postgres queries
Merge pull request #64 from bengler/upgrade2014

Update pebblebed
Update pebbles-cors
Add bin/grove, a tool for working with Grove data.
Fix nil exception in /posts/:uid when passing multiple terms and one does not resolve to a post.