Merge "Merge both maven repo in one." into idea133