r2_contacts initial commit
Merge branch 'master' into r2_contacts
done for r2_contacts;this already has master 1.1
master to r2_contacts; r2_contacts merged into master;happy-happy; master should have merged content of 1.1, r2_index, r2_contacts