Merge branch 'hotfix/3.4.7'
Fix wrong calculation of reading plan date number because of DST
Project settings change
Remove unused code
Persist selected sort options on BookmarkListActivity
"Compare" feature: compare different versions of a verse
Verse not available should not crash marker/bookmark list screen.
Merge branch 'hotfix/compare-versions'
Merge branch 'hotfix/compare-versions' into develop

Conflicts:
	Alkitab/src/yuku/alkitab/base/S.java
	Alkitab/src/yuku/alkitab/base/ac/BookmarkListActivity.java
	Alkitab/src/yuku/alkitab/base/dialog/VersesDialog.java
	AlkitabConverterTest/AlkitabConverterTest.iml
Make about look better
Merge branch 'hotfix/about'
Merge branch 'hotfix/about' into develop
Bump version
New icons for quick bible. New density icons xxxhdpi for all.
Make java sources compiled in java 7 source and target.
Also fix BuildConfig proguard warning.
add "-digestalg SHA1 -sigalg MD5withRSA" to the jarsigner command for java 7
Use the highest resolution image for logo in about screen
Update translations
Merge branch 'hotfix/3.5.0' into develop

Conflicts:
	Alkitab/AndroidManifest.xml