filted update
Merge branch 'master' of https://github.com/mpsk/BookReader
words ''
working searching (words)
Merge branch 'master' of https://github.com/mpsk/BookReader

Conflicts:
	app/viewmodels/shell.js
	app/viewmodels/words.js
shell merged