updated build scripts for Gradle 2.0 compatibility, included merged keystore in order not to break other kindlets