Merge remote-tracking branch 'githubrepo/master' into local_master

Conflicts:
	build.gradle
	jars/jars/mediafire-sdk/maven-metadata.xml
	jars/jars/mediafire-sdk/maven-metadata.xml.md5
	jars/jars/mediafire-sdk/maven-metadata.xml.sha1
	src/main/java/com/mediafire/sdk/config/defaults/DefaultActionTokenManager.java
Merge remote-tracking branch 'githubrepo/master' into local_master

Conflicts:
	build.gradle
	jars/jars/mediafire-sdk/maven-metadata.xml
	jars/jars/mediafire-sdk/maven-metadata.xml.md5
	jars/jars/mediafire-sdk/maven-metadata.xml.sha1
	src/main/java/com/mediafire/sdk/config/defaults/DefaultActionTokenManager.java