v3.0.7

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/compiler.xml
#	.idea/gradle.xml
#	.idea/misc.xml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	themes/build.gradle