Merge branch 'master' of https://github.com/inorichi/tachiyomi

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/backup/BackupPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/res/raw/changelog_release.xml
#	app/src/main/res/values/arrays.xml
#	app/src/main/res/values/strings.xml

app/src/main/java/exh/EHSourceHelpers.kt

@@ -0,0 +1,5 @@
+package exh
+
+/**
+ * Created by nulldev on 2/28/17.
+ */

app/src/main/java/exh/ui/migration/SourceMigrator.kt

@@ -0,0 +1,5 @@
+package exh.ui.migration
+
+/**
+ * Created by nulldev on 2/28/17.
+ */