Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/vcs.xml
#	app/build.gradle
#	app/src/main/java/com/ic/ak/launcher/LauncherApp.java
#	app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java
#	app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java
#	app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
#	app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java
#	app/src/main/java/com/ic/ak/launcher/ui/dialog/BatteryLowFragment.java
#	app/src/main/java/com/ic/ak/launcher/ui/dialog/NotificationDialogFragment.java
#	app/src/main/java/com/ic/ak/launcher/ui/dialog/SedentaryAlarmDialogFragment.java
#	app/src/main/java/com/ic/ak/launcher/ui/dialog/SlipTipsFragment.java
#	app/src/main/java/com/ic/ak/launcher/ui/dialog/TextShowDialogFragment.java
#	app/version_code.properties