merging
gradle build based development branch working now (without
incubator.test)