merge changes
Merge branch 'master' of https://github.com/mpsk/BookReader

Conflicts:
	app/views/shell.html
yandex translate test
Merge branch 'master' of https://github.com/mpsk/BookReader
yandex translate test