update for version 2.0
Merge branch 'xyz_r2_index'

Conflicts:
	grails-app/views/index.gsp