Merge pull request koreader#1696 from chrox/fix_flush_settings

fix FlushSettings event consumed by statistics plugin

Merge pull request koreader#1684 from chrox/fix_kobo_touch_probe

fix kobo touch probe

Merge pull request koreader#1667 from chrox/fixes_for_stable_release

add support for password protected zip/cbz documents

Merge pull request koreader#1662 from chrox/fixes_for_stable_release

Fixes for stable release

Merge pull request koreader#1639 from chrox/fix_travis

fix unit test fail on Travis

Merge pull request koreader#1630 from NiLuJe/master

Prefix battery percentage w/ a + when charging.

Merge pull request koreader#1588 from mihailim/feature/fix-builddep-docs

Fix Linux build docs to mention luarocks

Merge pull request koreader#1572 from chrox/fix-1558

partial refresh after deleting highlights

Merge pull request koreader#1564 from Frenzie/koreader.sh

Fix KOReader exit

Merge pull request koreader#1555 from chrox/android_icon

add koreader app icon for android finally