Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	.idea/modules.xml
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.unitTest.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml
#	.idea/modules/common/PhoneProfilesPlus.common.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
#	gradle/wrapper/gradle-wrapper.properties

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	.idea/modules.xml
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.unitTest.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.androidTest.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.androidTest.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml
#	.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.androidTest.iml
#	.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml
#	.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
#	.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.unitTest.iml
#	.idea/modules/common/PhoneProfilesPlus.common.androidTest.iml
#	.idea/modules/common/PhoneProfilesPlus.common.iml
#	.idea/modules/common/PhoneProfilesPlus.common.main.iml
#	.idea/modules/common/PhoneProfilesPlus.common.unitTest.iml
#	.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.androidTest.iml
#	.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml
#	.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
#	.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.unitTest.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.androidTest.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.main.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.unitTest.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.main.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.unitTest.iml
#	.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.androidTest.iml
#	.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml
#	.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
#	.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.unitTest.iml
#	gradle/wrapper/gradle-wrapper.properties

...

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	README.md

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	RootShell/build.gradle
#	RootTools/build.gradle
#	noobcameraflash/build.gradle
#	phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
#	.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
#	.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
#	.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
#	.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml
#	.idea/modules/common/PhoneProfilesPlus.common.iml
#	.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml
#	.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
#	.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml
#	build.gradle

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts:
#	.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml
#	README.md
#	docs/install_apk_from_pc.md

Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus