Merge branch 'master' into master-2

Dennis Kao

2016-04-25 4b0f4c0e8a08411990dbc5391142bc48fdd858aa

1
2
3
4
5
6
#Wed Apr 20 14:28:59 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip