Basket view, improved book-detail view, improved menu generation
Merge remote-tracking branch 'origin/master'