shell v updates
Merge branch 'master' of https://github.com/mpsk/BookReader

Conflicts:
	app/viewmodels/library.js