Migration to Gradle build system and integrated the demo in the same project, also small changes in preferences style