Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/build.gradle
#	lib/src/main/java/com/thomas/update/manager/DownloadManager.java

Author: androidflying