merge RESETfulSky into JavaSky