Merge "rework of the way we process java resources." into studio-1.4-dev