upgrading all projects to GradleFx 1.0 and Gradle 2.1
Merge branch 'develop'