fixed master version 1.1
resolved conflicts master to r2_contacts