index.html-first team- r2 branch
resolve index conflict
added p for release 2 from r2 merged branch
Merge branch 'r2' to local master