Поддержка Sony PRS-T2/T1. Аппаратные кнопки и режим экрана NoRefresh.
Update .gitignore
Поддержка Sony PRS-T2/T1. Аппаратные кнопки и режим экрана NoRefresh.
Merge remote-tracking branch 'origin/sonyprs' into sonyprs
Поддержка Sony PRS-T2/T1. Аппаратные кнопки и режим экрана NoRefresh.
Merge remote-tracking branch 'origin/develop' into sony-prs
Merge remote-tracking branch 'origin/sonyprs' into sony-prs
Merge branch 'sonyprs' into sony-prs
Поддержка Sony PRS-T2/T1. Аппаратные кнопки и режим экрана NoRefresh.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	.gitignore
Merge branch 'develop' into sonyprs
Merge remote-tracking branch 'origin/develop' into sonyprs
Отображение параллельного перевода
Merge remote-tracking branch 'origin/develop' into SonyPRS

Conflicts:
	src/com/BibleQuote/activity/ReaderActivity.java
	src/com/BibleQuote/widget/ReaderWebView.java
Merging of upstream/develop (разрешение конфликта)
Merge remote-tracking branch 'origin/develop' into ParTranslates

Conflicts:
	src/com/BibleQuote/activity/ReaderActivity.java
	src/com/BibleQuote/controllers/FsChapterController.java
	src/com/BibleQuote/managers/Librarian.java
work 1
Revert "work 1"

This reverts commit 9f49f409cf2060a61c8651b73a6e5b1d72a3c153.
work commit
work commit