Merge branch 'collab/miker/web-client-sprint1-bug-fixing-rebased-collab' into webstaf...
authorGalen Charlton <gmc@esilibrary.com>
Thu, 15 Jan 2015 16:23:00 +0000 (16:23 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 15 Jan 2015 16:23:00 +0000 (16:23 +0000)

Trivial merge