First commit in branch 1

Upgrade 1/
Merging master to r2_index
Final commit of index

Version 2 of project.