Merge branch 'zuber-view-refactor'

Conflicts:
	apps/api/handlers/library_handlers.py

diff --cc apps/api/handlers/library_handlers.py
Simple merge

diff --cc project/static/css/master.css
index 44bd62e,dbf5c77..7caa732
--- 1/project/static/css/master.css
--- 2/project/static/css/master.css
+++ b/project/static/css/master.css
@@@ -35,10 -35,8 +35,9 @@@ body 
      top: 2.4em; left: 0px; right: 0px; bottom: 0px;
      overflow: auto;    
      background-color: white;
-     padding: 0.2em 1em;
  }
  
 +/*
  ul {
      margin: 20px;
      padding: 0;