Merge branch 'app'

# Conflicts:
#	lib/librarian

diff --combined lib/librarian
index 7dc1b2c,0e7deb2..df1ef1a
--- 1/lib/librarian
--- 2/lib/librarian
+++ b/lib/librarian
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7dc1b2c84ca9b53454d9eb0c296b4f005dcb780c
 -Subproject commit 0e7deb2034ce53924098ecab626c5d763d9a9700
++Subproject commit df1ef1a80800b58ae6d818f5bdb0ff919c558d37