updated
updated
updated indexing
Merge branch 'xyz_r2_index'

Conflicts:
	grails-app/views/index.gsp