Index page modified
r2 message added
Conflicts resolved
New features added by r2_index
master added to r2_index