Fixed wrong generated libs.
Merge branch 'develop'
updated gradle
Merge branch 'master' into release

Conflicts:
	.gradle/1.6/taskArtifacts/fileHashes.bin
	.gradle/1.6/taskArtifacts/fileSnapshots.bin
	.gradle/1.6/taskArtifacts/outputFileStates.bin
	.gradle/1.6/taskArtifacts/taskArtifacts.bin