Merge branch 'master' into merge_guides
Merge branch 'master' into merge_guides
Merge branch 'merge_guides' of github.com:mikesname/docview into merge_guides
Merge branch 'master' into merge_guides
Fix primaryDescription with implicit lang so correct 2-letter code is used. (Closes #333)
Remove unnecessary package qualification
Assert for bug #333
Add missing implicit lang and minorly refactor description section layout
Add missing lang parameter to access point template partials
Add yet another missing lang parameter (need to automate this somehow?)
Tweaks to the search DAO to aid re-usability
Tiny style adjustment
Add a new method to determine if a page is counted (bounded) or not
Update sbt-rjs
Merge branch 'master' into rest_paging
First pass at adapting backend list schema to new paging system.
More refactoring of listing/paging
Update following/watching/blocking API, plus a few other tweaks
Cleanups to permission handling:
 - De-parametize global and item permission sets (whoever thought
   of that was stupid.)
 - Fix some of the templates around revoking permissions
Refactor the way global and item permission sets are deserialized