Migrate build script to the latest one
Resolve conflicts

Merge branch 'develop' into feature/MigrateBuildScript

Conflicts:
	amalgam/Amalgam/build.gradle
	amalgam/gradle/wrapper/gradle-wrapper.properties
Merge pull request #45 from KeithYokoma/feature/MigrateBuildScript

Migrate build script to the latest one