organized imports
Merge branch 'dev' of git@github.com:LePhil/Bibliotheca.git into dev